diff --git a/.github/actions/cleanup-and-coverage/action.yaml b/.github/actions/cleanup-and-coverage/action.yaml index 8af4310092..f783b9518d 100644 --- a/.github/actions/cleanup-and-coverage/action.yaml +++ b/.github/actions/cleanup-and-coverage/action.yaml @@ -9,6 +9,10 @@ inputs: codecov-token: description: 'Codecov token for uploading reports' required: true + job-name: + description: 'Used to locate coverage dir (/tmp/coverage/); pass matrix.job-name for matrix jobs.' + required: false + default: '${{ github.job }}' flags: description: 'Flags to identify the coverage report' required: false @@ -35,6 +39,6 @@ runs: uses: codecov/codecov-action@v5 with: token: ${{ inputs.codecov-token }} - directory: /tmp/coverage/${{ github.job }} + directory: /tmp/coverage/${{ inputs.job-name }} flags: ${{ inputs.flags }} if: ${{ !cancelled() }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 21c96044a5..56a144e128 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -472,6 +472,7 @@ jobs: uses: ./.github/actions/cleanup-and-coverage with: codecov-token: ${{ secrets.CODECOV_TOKEN }} + job-name: ${{ matrix.job-name }} flags: ${{ matrix.job-name }} if: always() - name: Upload test results to Codecov @@ -513,7 +514,7 @@ jobs: S3DATA: scality S3METADATA: scality S3VAULT: scality - CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }} + CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage MPU_TESTING: "yes" DEFAULT_BUCKET_KEY_FORMAT: ${{ matrix.vformat }} ENABLE_NULL_VERSION_COMPAT_MODE: ${{ matrix.enable-null-compat }} @@ -603,6 +604,7 @@ jobs: uses: ./.github/actions/cleanup-and-coverage with: codecov-token: ${{ secrets.CODECOV_TOKEN }} + job-name: ${{ matrix.job-name }} flags: ${{ matrix.job-name }} if: always() - name: Upload test results to Codecov diff --git a/package.json b/package.json index 4b53cf4db3..1b3e9f2052 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@zenko/cloudserver", - "version": "9.2.24-4", + "version": "9.2.24-5", "description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol", "main": "index.js", "engines": { @@ -21,7 +21,7 @@ "dependencies": { "@azure/storage-blob": "^12.28.0", "@hapi/joi": "^17.1.1", - "arsenal": "git+https://github.com/scality/arsenal#8.2.48", + "arsenal": "git+https://github.com/scality/arsenal#8.2.48-1", "async": "2.6.4", "aws-sdk": "^2.1692.0", "bucketclient": "scality/bucketclient#8.2.7", diff --git a/yarn.lock b/yarn.lock index 4f2f941009..d9e4260fba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1527,9 +1527,9 @@ arraybuffer.prototype.slice@^1.0.4: optionalDependencies: ioctl "^2.0.2" -"arsenal@git+https://github.com/scality/arsenal#8.2.48": - version "8.2.48" - resolved "git+https://github.com/scality/arsenal#362f7908b6126709add96ee981d5235d96bab58c" +"arsenal@git+https://github.com/scality/arsenal#8.2.48-1": + version "8.2.48-1" + resolved "git+https://github.com/scality/arsenal#a4b069070683e91e511b8943346c691f92503f52" dependencies: "@azure/identity" "^4.13.0" "@azure/storage-blob" "^12.28.0" @@ -1558,7 +1558,7 @@ arraybuffer.prototype.slice@^1.0.4: simple-glob "^0.2.0" socket.io "^4.8.0" socket.io-client "^4.8.0" - sproxydclient "github:scality/sproxydclient#8.1.0" + sproxydclient "github:scality/sproxydclient#8.2.1" utf8 "^3.0.0" uuid "^10.0.0" werelogs scality/werelogs#8.2.2 @@ -6596,6 +6596,14 @@ sprintf-js@~1.0.2: httpagent "github:scality/httpagent#1.1.0" werelogs scality/werelogs#8.2.0 +"sproxydclient@github:scality/sproxydclient#8.2.1": + version "8.2.1" + resolved "https://codeload.github.com/scality/sproxydclient/tar.gz/501829f5521787e7e946de6792f5806ffa6ec437" + dependencies: + async "^3.2.6" + httpagent "github:scality/httpagent#1.1.0" + werelogs scality/werelogs#8.2.0 + sql-where-parser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/sql-where-parser/-/sql-where-parser-2.2.1.tgz#d9af68c20ebfdffe9a115a119f65abc4fbb7c2e5"