From ce28740831cd44996e7365f06b34a63fc0476e34 Mon Sep 17 00:00:00 2001 From: Matthias Fasching <5011972+fasmat@users.noreply.github.com> Date: Thu, 22 Aug 2024 20:05:15 +0000 Subject: [PATCH 1/2] Replace abandoned GH action for publishing swagger files (#6287) ## Motivation `jakejarvis/s3-sync-action` seems to have been abandoned a while ago and it is trivial to do the same without using the action. --- .github/workflows/api-swagger-ui.yml | 33 +++++++++++++--------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/api-swagger-ui.yml b/.github/workflows/api-swagger-ui.yml index 61056baa0f..a38a3ef258 100644 --- a/.github/workflows/api-swagger-ui.yml +++ b/.github/workflows/api-swagger-ui.yml @@ -9,7 +9,7 @@ on: push: tags: - '*' - + jobs: check-version: runs-on: ubuntu-22.04 @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout target repository on last release uses: actions/checkout@v4 - + - name: Set up Go uses: actions/setup-go@v4 with: @@ -43,16 +43,15 @@ jobs: ref: 'refs/tags/${{ needs.check-version.outputs.go-sm-api-version }}' - name: upload to testnet - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks + run: > + aws s3 sync api/release/openapi/swagger/src + s3://${{ secrets.CLOUDFLARE_TESTNET_API_BUCKET }}/${{ github.ref_name }} + --endpoint-url https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com + --acl public-read --follow-symlinks env: - AWS_S3_BUCKET: ${{ secrets.CLOUDFLARE_TESTNET_API_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - SOURCE_DIR: api/release/openapi/swagger/src - DEST_DIR: '${{ github.ref_name }}' - AWS_S3_ENDPOINT: https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com + AWS_REGION: us-east-1 - name: update url json file for testnet working-directory: api/release/openapi/swagger/src @@ -61,16 +60,14 @@ jobs: curl -o spec_urls.json https://testnet-api-docs.spacemesh.network/spec_urls.json new_url="{\"url\":\"https://testnet-api-docs.spacemesh.network/${{ github.ref_name }}/api.swagger.json\",\"name\":\"${{ github.ref_name }}\"}" jq ". += [$new_url]" spec_urls.json > tmp.json && mv tmp.json spec_urls.json - + - name: upload new testnet json file - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks + run: > + aws s3 sync api/release/openapi/swagger/src/spec + s3://${{ secrets.CLOUDFLARE_TESTNET_API_BUCKET }} + --endpoint-url https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com + --acl public-read --follow-symlinks env: - AWS_S3_BUCKET: ${{ secrets.CLOUDFLARE_TESTNET_API_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - SOURCE_DIR: api/release/openapi/swagger/src/spec - DEST_DIR: '' - AWS_S3_ENDPOINT: https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com - \ No newline at end of file + AWS_REGION: us-east-1 From 5cb36235a219bdb5fd6dadd053131c1cefa50a11 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:13:15 +0000 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2cd6ed973..aec92946c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,6 @@ See [RELEASE](./RELEASE.md) for workflow instructions. * [#6268](https://github.com/spacemeshos/go-spacemesh/pull/6268) Fix incorrect timing collection for proposal builder. -* [#6278](https://github.com/spacemeshos/go-spacemesh/pull/6278) Reduce logging levels of some messages to reduce noise. - ## Release v1.6.7 ### Improvements