From d3dc9d852d75ba376257ebc94282ebaaf61cf617 Mon Sep 17 00:00:00 2001 From: Gregor MacLennan Date: Mon, 21 Oct 2024 16:33:32 +0100 Subject: [PATCH 1/2] chore: don't sync semver tags for releases (#921) The optic release option `sync-semver-tags` creates additional tags (`v{MAJOR}`, `v{MAJOR}.{MINOR}`) which are updated on each release. This currently does not work because this tag push happens with the permissions of the default github actions token, which does not have rule bypass permissions. It's a "soft fail" (the release still gets made), and the full version tag comes from the release creation, which is done by the optic release app, which is included in our ruleset bypass list. We don't need these tags, and they are not working, so this PR turns this option off. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6cb9eee32..d890f2915 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - uses: nearform-actions/optic-release-automation-action@v4 with: commit-message: 'Release {version}' - sync-semver-tags: true + sync-semver-tags: false access: 'public' # This prefix is added before the prerelease number, e.g. `v3.0.0-alpha.0` # prerelease-prefix: 'alpha' From c4ae725fd7ba47ff52be58ccc7f5cf83f5ee7dca Mon Sep 17 00:00:00 2001 From: Evan Hahn Date: Mon, 21 Oct 2024 16:29:20 -0500 Subject: [PATCH 2/2] test: use correct MIME type for MP3 (#923) This is a test-only change. According to [Apache's list][0], the correct MIME type for `.mp3` files is `audio/mpeg`, not `audio/mp3`. [0]: https://github.com/apache/httpd/blob/f5c4355420d4463c860aa0d85757bfb7a2dd0a40/docs/conf/mime.types#L1441 --- test-e2e/manager-fastify-server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-e2e/manager-fastify-server.js b/test-e2e/manager-fastify-server.js index 24cb66de6..542869813 100644 --- a/test-e2e/manager-fastify-server.js +++ b/test-e2e/manager-fastify-server.js @@ -304,7 +304,7 @@ test('retrieving audio file', async (t) => { await t.test('creating audio', async () => { const blobId = await project.$blobs.create( { original: join(BLOB_FIXTURES_DIR, 'audio.mp3') }, - blobMetadata({ mimeType: 'audio/mp3' }) + blobMetadata({ mimeType: 'audio/mpeg' }) ) const blobUrl = await project.$blobs.getUrl({ ...blobId, @@ -320,7 +320,7 @@ test('retrieving audio file', async (t) => { assert.equal(response.status, 200, 'response status ok') assert.equal( response.headers.get('content-type'), - 'audio/mp3', + 'audio/mpeg', 'matching content type header' ) const expected = await fs.readFile(join(BLOB_FIXTURES_DIR, 'audio.mp3'))