From 8f5a813ecece63e7e4a96be623aa65fd89e5693f Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 15:35:28 -0400 Subject: [PATCH 01/22] build: upgrate artifacts actions to v4 --- .github/workflows/build.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29dcba922106..7edeeef63a6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -408,9 +408,9 @@ jobs: DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }} - name: Extract Profiling Node Prebuilt Binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }} path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Pack tarballs @@ -1612,10 +1612,7 @@ jobs: yarn lerna run test --scope @sentry/profiling-node - name: Archive Binary - # @TODO: v4 breaks convenient merging of same name artifacts - # https://github.com/actions/upload-artifact/issues/478 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: profiling-node-binaries-${{ github.sha }} - path: | - ${{ github.workspace }}/packages/profiling-node/lib/*.node + name: profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} + path: ${{ github.workspace }}/packages/profiling-node/lib/*.node From f48bf53c1d4dea952fbde2b5b2ef9f78dc7a2e4a Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 15:39:58 -0400 Subject: [PATCH 02/22] fix pattern --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7edeeef63a6f..b7690e32166d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -410,7 +410,7 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }}* path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Pack tarballs From e94fdc23f4ca307f8238309e31f54a3d5cce9a8a Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 16:19:12 -0400 Subject: [PATCH 03/22] trigger profiling action --- packages/profiling-node/bindings/cpu_profiler.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/profiling-node/bindings/cpu_profiler.cc b/packages/profiling-node/bindings/cpu_profiler.cc index 9cda97d46b40..00996db9e8c9 100644 --- a/packages/profiling-node/bindings/cpu_profiler.cc +++ b/packages/profiling-node/bindings/cpu_profiler.cc @@ -28,6 +28,7 @@ enum ProfileFormat { kFormatThread = 0, kFormatChunk = 1, }; + // Allow users to override the default logging mode via env variable. This is // useful because sometimes the flow of the profiled program can be to execute // many sequential transaction - in that case, it may be preferable to set eager From 0e7232d9ff0109d818c8d86dcb56a270fd0c9872 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 16:44:20 -0400 Subject: [PATCH 04/22] sanitize output --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7690e32166d..6f6f4feb82f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1610,9 +1610,12 @@ jobs: if: matrix.arch != 'arm64' run: | yarn lerna run test --scope @sentry/profiling-node + - name: Binary Key + id: binary-key + run: echo "::set-output name=binary-key::profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} | sed's/:/-/g'" - name: Archive Binary uses: actions/upload-artifact@v4 with: - name: profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} + name: ${{ steps.binary-key.outputs.binary-key }} path: ${{ github.workspace }}/packages/profiling-node/lib/*.node From 448679575dfc43121d0a2db0277a40a001d79a2d Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 16:45:10 -0400 Subject: [PATCH 05/22] profiling check --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f6f4feb82f4..964eb7d9e5f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1610,6 +1610,7 @@ jobs: if: matrix.arch != 'arm64' run: | yarn lerna run test --scope @sentry/profiling-node + - name: Binary Key id: binary-key run: echo "::set-output name=binary-key::profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} | sed's/:/-/g'" From 52b69cb5d48fec8a4a54d7610d2279564949e3b1 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 17:02:34 -0400 Subject: [PATCH 06/22] wrong --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 964eb7d9e5f4..d21fb2eada7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: 'CI: Build & Test' +tname: 'CI: Build & Test' on: push: branches: @@ -1613,7 +1613,7 @@ jobs: - name: Binary Key id: binary-key - run: echo "::set-output name=binary-key::profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} | sed's/:/-/g'" + run: echo "::set-output name=binary-key::profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} | sed 's/:/-/g'" - name: Archive Binary uses: actions/upload-artifact@v4 From f9d6ff9414f48a1b32fe61844b0e17d3d034c80a Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 17:35:21 -0400 Subject: [PATCH 07/22] bump From 1200fd0a286fdbd987de61a029a76d9a392492be Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 18:20:31 -0400 Subject: [PATCH 08/22] fix typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d21fb2eada7c..8c6333b11d18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -tname: 'CI: Build & Test' +name: 'CI: Build & Test' on: push: branches: From d1b5d4d6e11ecfebace6afd6d35e7097610d52ee Mon Sep 17 00:00:00 2001 From: JonasBa Date: Wed, 31 Jul 2024 21:25:25 -0400 Subject: [PATCH 09/22] use github output fix cmd windows test --- .github/workflows/build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c6333b11d18..4e88fa9ce65f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1613,10 +1613,16 @@ jobs: - name: Binary Key id: binary-key - run: echo "::set-output name=binary-key::profiling-node-binaries-${{ github.sha }}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }} | sed 's/:/-/g'" + if: contains(matrix.container, ':') + run: | + key="profiling-node-binaries-${GITHUB_SHA}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }}" + if [[ "$key" == *:* ]]; then + key=$(echo "$key" | sed 's/:/-/g') + fi + echo "key=$key" >> $GITHUB_ENV - name: Archive Binary uses: actions/upload-artifact@v4 with: - name: ${{ steps.binary-key.outputs.binary-key }} + name: ${{ steps.binary-key.outputs.key }} path: ${{ github.workspace }}/packages/profiling-node/lib/*.node From ddb73cdc5fac53b8c0e9c54c3b057852c7258864 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 09:17:44 -0400 Subject: [PATCH 10/22] set key directly --- .github/workflows/build.yml | 42 ++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e88fa9ce65f..8df2a4515346 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1256,7 +1256,7 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v3 with: - name: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }}* path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Restore tarball cache @@ -1383,104 +1383,132 @@ jobs: # x64 glibc - os: ubuntu-20.04 node: 16 + binary-key: '16-x64-glibc' - os: ubuntu-20.04 node: 18 + binary-key: '18-x64-glibc' - os: ubuntu-20.04 node: 20 + binary-key: '20-x64-glibc' - os: ubuntu-20.04 node: 22 + binary-key: '22-x64-glibc' # x64 musl - os: ubuntu-20.04 container: node:16-alpine3.16 node: 16 + binary-key: '16-x64-musl' - os: ubuntu-20.04 container: node:18-alpine3.17 node: 18 + binary-key: '18-x64-musl' - os: ubuntu-20.04 container: node:20-alpine3.17 node: 20 + binary-key: '20-x64-musl' - os: ubuntu-20.04 container: node:22-alpine3.18 node: 22 + binary-key: '22-x64-musl' # arm64 glibc - os: ubuntu-20.04 arch: arm64 node: 16 + binary-key: '16-arm64-glibc' - os: ubuntu-20.04 arch: arm64 node: 18 + binary-key: '18-arm64-glibc' - os: ubuntu-20.04 arch: arm64 node: 20 + binary-key: '20-arm64-glibc' - os: ubuntu-20.04 arch: arm64 node: 22 + binary-key: '22-arm64-glibc' # arm64 musl - os: ubuntu-20.04 container: node:16-alpine3.16 arch: arm64 node: 16 + binary-key: '16-arm64-musl' - os: ubuntu-20.04 arch: arm64 container: node:18-alpine3.17 node: 18 + binary-key: '18-arm64-musl' - os: ubuntu-20.04 arch: arm64 container: node:20-alpine3.17 node: 20 + binary-key: '20-arm64-musl' - os: ubuntu-20.04 arch: arm64 container: node:22-alpine3.18 node: 22 + binary-key: '22-arm64-musl' # macos x64 - os: macos-13 node: 16 arch: x64 + binary-key: '16-x64-darwin' - os: macos-13 node: 18 arch: x64 + binary-key: '18-x64-darwin' - os: macos-13 node: 20 arch: x64 + binary-key: '20-x64-darwin' - os: macos-13 node: 22 arch: x64 + binary-key: '22-x64-darwin' # macos arm64 - os: macos-13 arch: arm64 node: 16 target_platform: darwin + binary-key: '16-arm64-darwin' - os: macos-13 arch: arm64 node: 18 target_platform: darwin + binary-key: '18-arm64-darwin' - os: macos-13 arch: arm64 node: 20 target_platform: darwin + binary-key: '20-arm64-darwin' - os: macos-13 arch: arm64 node: 22 target_platform: darwin + binary-key: '22-arm64-darwin' # windows x64 - os: windows-2022 node: 16 arch: x64 + binary-key: '16-x64-windows' - os: windows-2022 node: 18 arch: x64 + binary-key: '18-x64-windows' - os: windows-2022 node: 20 arch: x64 + binary-key: '20-x64-windows' - os: windows-2022 node: 22 arch: x64 + binary-key: '22-x64-windows' steps: - name: Setup (alpine) @@ -1611,18 +1639,8 @@ jobs: run: | yarn lerna run test --scope @sentry/profiling-node - - name: Binary Key - id: binary-key - if: contains(matrix.container, ':') - run: | - key="profiling-node-binaries-${GITHUB_SHA}-${{ matrix.node }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.container }}" - if [[ "$key" == *:* ]]; then - key=$(echo "$key" | sed 's/:/-/g') - fi - echo "key=$key" >> $GITHUB_ENV - - name: Archive Binary uses: actions/upload-artifact@v4 with: - name: ${{ steps.binary-key.outputs.key }} + name: profiling-node-binaries-${{ github.sha }}-${{ matrix.binary-key }} path: ${{ github.workspace }}/packages/profiling-node/lib/*.node From 0d0fd8762e5446d535d2605ac9388734308986ec Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 09:53:47 -0400 Subject: [PATCH 11/22] test download --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8df2a4515346..c2b713b2b670 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -410,7 +410,7 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }}* + pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Pack tarballs @@ -932,9 +932,9 @@ jobs: (needs.job_get_metadata.outputs.changed_profiling_node_bindings == 'true') || (needs.job_get_metadata.outputs.is_release == 'true') || (github.event_name != 'pull_request') - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Build Profiling tarball From 630baf18c658c8ecb0ba582e9247a7ce6edca9bf Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 11:13:36 -0400 Subject: [PATCH 12/22] log what was downloaded --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2b713b2b670..1079c9623edd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -926,8 +926,6 @@ jobs: run: yarn lerna run build:lib --scope @sentry/profiling-node - name: Extract Profiling Node Prebuilt Binaries - # @TODO: v4 breaks convenient merging of same name artifacts - # https://github.com/actions/upload-artifact/issues/478 if: | (needs.job_get_metadata.outputs.changed_profiling_node_bindings == 'true') || (needs.job_get_metadata.outputs.is_release == 'true') || @@ -937,6 +935,9 @@ jobs: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ + - name: Log downloaded binaries + run: ls -la ${{ github.workspace }}/packages/profiling-node/lib/ + - name: Build Profiling tarball run: yarn build:tarball # End rebuild profiling @@ -1254,7 +1255,7 @@ jobs: - name: Build Profiling Node run: yarn lerna run build:lib --scope @sentry/profiling-node - name: Extract Profiling Node Prebuilt Binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: pattern: profiling-node-binaries-${{ github.sha }}* path: ${{ github.workspace }}/packages/profiling-node/lib/ From cf85930b7199bb07b2981bf3ffbe8fa400a3edf7 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 13:25:35 -0400 Subject: [PATCH 13/22] test merge multiple --- .github/workflows/build.yml | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1079c9623edd..4ef048e39589 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -412,6 +412,7 @@ jobs: with: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ + merge-multiple: true - name: Pack tarballs run: yarn build:tarball @@ -934,6 +935,7 @@ jobs: with: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ + merge-multiple: true - name: Log downloaded binaries run: ls -la ${{ github.workspace }}/packages/profiling-node/lib/ @@ -1384,132 +1386,104 @@ jobs: # x64 glibc - os: ubuntu-20.04 node: 16 - binary-key: '16-x64-glibc' - os: ubuntu-20.04 node: 18 - binary-key: '18-x64-glibc' - os: ubuntu-20.04 node: 20 - binary-key: '20-x64-glibc' - os: ubuntu-20.04 node: 22 - binary-key: '22-x64-glibc' # x64 musl - os: ubuntu-20.04 container: node:16-alpine3.16 node: 16 - binary-key: '16-x64-musl' - os: ubuntu-20.04 container: node:18-alpine3.17 node: 18 - binary-key: '18-x64-musl' - os: ubuntu-20.04 container: node:20-alpine3.17 node: 20 - binary-key: '20-x64-musl' - os: ubuntu-20.04 container: node:22-alpine3.18 node: 22 - binary-key: '22-x64-musl' # arm64 glibc - os: ubuntu-20.04 arch: arm64 node: 16 - binary-key: '16-arm64-glibc' - os: ubuntu-20.04 arch: arm64 node: 18 - binary-key: '18-arm64-glibc' - os: ubuntu-20.04 arch: arm64 node: 20 - binary-key: '20-arm64-glibc' - os: ubuntu-20.04 arch: arm64 node: 22 - binary-key: '22-arm64-glibc' # arm64 musl - os: ubuntu-20.04 container: node:16-alpine3.16 arch: arm64 node: 16 - binary-key: '16-arm64-musl' - os: ubuntu-20.04 arch: arm64 container: node:18-alpine3.17 node: 18 - binary-key: '18-arm64-musl' - os: ubuntu-20.04 arch: arm64 container: node:20-alpine3.17 node: 20 - binary-key: '20-arm64-musl' - os: ubuntu-20.04 arch: arm64 container: node:22-alpine3.18 node: 22 - binary-key: '22-arm64-musl' # macos x64 - os: macos-13 node: 16 arch: x64 - binary-key: '16-x64-darwin' - os: macos-13 node: 18 arch: x64 - binary-key: '18-x64-darwin' - os: macos-13 node: 20 arch: x64 - binary-key: '20-x64-darwin' - os: macos-13 node: 22 arch: x64 - binary-key: '22-x64-darwin' # macos arm64 - os: macos-13 arch: arm64 node: 16 target_platform: darwin - binary-key: '16-arm64-darwin' - os: macos-13 arch: arm64 node: 18 target_platform: darwin - binary-key: '18-arm64-darwin' - os: macos-13 arch: arm64 node: 20 target_platform: darwin - binary-key: '20-arm64-darwin' - os: macos-13 arch: arm64 node: 22 target_platform: darwin - binary-key: '22-arm64-darwin' # windows x64 - os: windows-2022 node: 16 arch: x64 - binary-key: '16-x64-windows' - os: windows-2022 node: 18 arch: x64 - binary-key: '18-x64-windows' - os: windows-2022 node: 20 arch: x64 - binary-key: '20-x64-windows' - os: windows-2022 node: 22 arch: x64 - binary-key: '22-x64-windows' steps: - name: Setup (alpine) @@ -1643,5 +1617,5 @@ jobs: - name: Archive Binary uses: actions/upload-artifact@v4 with: - name: profiling-node-binaries-${{ github.sha }}-${{ matrix.binary-key }} + name: profiling-node-binaries-${{ github.sha }} path: ${{ github.workspace }}/packages/profiling-node/lib/*.node From 90e64fc5d3ea97783e8af15c10c1b447dd35ab44 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 14:04:58 -0400 Subject: [PATCH 14/22] test --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ef048e39589..46f8b18aa3ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -410,7 +410,7 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }}-* + pattern: profiling-node-binaries-${{ github.sha }} path: ${{ github.workspace }}/packages/profiling-node/lib/ merge-multiple: true @@ -933,7 +933,7 @@ jobs: (github.event_name != 'pull_request') uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }}-* + pattern: profiling-node-binaries-${{ github.sha }} path: ${{ github.workspace }}/packages/profiling-node/lib/ merge-multiple: true @@ -1259,7 +1259,7 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }}* + pattern: profiling-node-binaries-${{ github.sha }} path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Restore tarball cache From 86043a45e6b816b41ea712e10838aaf6a7f34d9c Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 16:33:29 -0400 Subject: [PATCH 15/22] test key --- .github/workflows/build.yml | 39 +++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46f8b18aa3ff..fef6c2718902 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -410,9 +410,8 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ - merge-multiple: true - name: Pack tarballs run: yarn build:tarball @@ -933,9 +932,8 @@ jobs: (github.event_name != 'pull_request') uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ - merge-multiple: true - name: Log downloaded binaries run: ls -la ${{ github.workspace }}/packages/profiling-node/lib/ @@ -1259,7 +1257,7 @@ jobs: - name: Extract Profiling Node Prebuilt Binaries uses: actions/download-artifact@v4 with: - pattern: profiling-node-binaries-${{ github.sha }} + pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ - name: Restore tarball cache @@ -1386,104 +1384,132 @@ jobs: # x64 glibc - os: ubuntu-20.04 node: 16 + binary: linux-x64-glibc-93 - os: ubuntu-20.04 node: 18 + binary: linux-x64-glibc-108 - os: ubuntu-20.04 node: 20 + binary: linux-x64-glibc-115 - os: ubuntu-20.04 node: 22 + binary: linux-x64-glibc-127 # x64 musl - os: ubuntu-20.04 container: node:16-alpine3.16 + binary: linux-x64-musl-93 node: 16 - os: ubuntu-20.04 container: node:18-alpine3.17 node: 18 + binary: linux-x64-musl-108 - os: ubuntu-20.04 container: node:20-alpine3.17 node: 20 + binary: linux-x64-musl-115 - os: ubuntu-20.04 container: node:22-alpine3.18 node: 22 + binary: linux-x64-musl-127 # arm64 glibc - os: ubuntu-20.04 arch: arm64 node: 16 + binary: linux-arm64-glibc-93 - os: ubuntu-20.04 arch: arm64 node: 18 + binary: linux-arm64-glibc-108 - os: ubuntu-20.04 arch: arm64 node: 20 + binary: linux-arm64-glibc-115 - os: ubuntu-20.04 arch: arm64 node: 22 + binary: linux-arm64-glibc-127 # arm64 musl - os: ubuntu-20.04 container: node:16-alpine3.16 arch: arm64 node: 16 + binary: linux-arm64-musl-93 - os: ubuntu-20.04 arch: arm64 container: node:18-alpine3.17 node: 18 + binary: linux-arm64-musl-108 - os: ubuntu-20.04 arch: arm64 container: node:20-alpine3.17 node: 20 + binary: linux-arm64-musl-115 - os: ubuntu-20.04 arch: arm64 container: node:22-alpine3.18 node: 22 + binary: linux-arm64-musl-127 # macos x64 - os: macos-13 node: 16 arch: x64 + binary: darwin-x64-93 - os: macos-13 node: 18 arch: x64 + binary: darwin-x64-108 - os: macos-13 node: 20 arch: x64 + binary: darwin-x64-115 - os: macos-13 node: 22 arch: x64 + binary: darwin-x64-127 # macos arm64 - os: macos-13 arch: arm64 node: 16 target_platform: darwin + binary: darwin-arm64-93 - os: macos-13 arch: arm64 node: 18 target_platform: darwin + binary: darwin-arm64-107 - os: macos-13 arch: arm64 node: 20 target_platform: darwin + binary: darwin-arm64-115 - os: macos-13 arch: arm64 node: 22 target_platform: darwin + binary: darwin-arm64-127 # windows x64 - os: windows-2022 node: 16 arch: x64 + binary: windows-win32-x64-93 - os: windows-2022 node: 18 arch: x64 + binary: windows-win32-x64-108 - os: windows-2022 node: 20 arch: x64 + binary: windows-win32-x64-115 - os: windows-2022 node: 22 arch: x64 + binary: windows-win32-x64-127 steps: - name: Setup (alpine) @@ -1617,5 +1643,6 @@ jobs: - name: Archive Binary uses: actions/upload-artifact@v4 with: - name: profiling-node-binaries-${{ github.sha }} + name: profiling-node-binaries-${{ github.sha }}-${{ matrix.binary }} path: ${{ github.workspace }}/packages/profiling-node/lib/*.node + if-no-files-found: error From 747321e994bae2eacd0470f9eee60c0331df3d2c Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 16:40:36 -0400 Subject: [PATCH 16/22] fix typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fef6c2718902..bbc6f5e6d23d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1481,7 +1481,7 @@ jobs: arch: arm64 node: 18 target_platform: darwin - binary: darwin-arm64-107 + binary: darwin-arm64-108 - os: macos-13 arch: arm64 node: 20 From be9ea8e1db3a2b4b9bd45d2a9c2a9cdc8f51337d Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 18:12:45 -0400 Subject: [PATCH 17/22] merge --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bbc6f5e6d23d..5ecf0109ce46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -412,6 +412,7 @@ jobs: with: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ + merge-multiple: true - name: Pack tarballs run: yarn build:tarball @@ -934,6 +935,7 @@ jobs: with: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ + merge-multiple: true - name: Log downloaded binaries run: ls -la ${{ github.workspace }}/packages/profiling-node/lib/ @@ -1497,19 +1499,19 @@ jobs: - os: windows-2022 node: 16 arch: x64 - binary: windows-win32-x64-93 + binary: win32-x64-93 - os: windows-2022 node: 18 arch: x64 - binary: windows-win32-x64-108 + binary: win32-x64-108 - os: windows-2022 node: 20 arch: x64 - binary: windows-win32-x64-115 + binary: win32-x64-115 - os: windows-2022 node: 22 arch: x64 - binary: windows-win32-x64-127 + binary: win32-x64-127 steps: - name: Setup (alpine) From 666e09ccf8f03af100263fdc90ed953cdb92b74f Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 20:21:46 -0400 Subject: [PATCH 18/22] direct file --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ecf0109ce46..4defc2fc6f06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -938,7 +938,8 @@ jobs: merge-multiple: true - name: Log downloaded binaries - run: ls -la ${{ github.workspace }}/packages/profiling-node/lib/ + run: | + ls -la ${{ github.workspace }}/packages/profiling-node/lib/ - name: Build Profiling tarball run: yarn build:tarball @@ -1646,5 +1647,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: profiling-node-binaries-${{ github.sha }}-${{ matrix.binary }} - path: ${{ github.workspace }}/packages/profiling-node/lib/*.node + path: ${{ github.workspace }}/packages/profiling-node/lib/sentry_cpu_profiler-${{matrix.binary}}.node if-no-files-found: error From 0edee9f039b90249cbc43c23e5d07ad8a5d8d392 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 21:37:39 -0400 Subject: [PATCH 19/22] log --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4defc2fc6f06..3e7b3471d759 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1262,6 +1262,11 @@ jobs: with: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ + merge-multiple: true + + - name: Log downloaded binaries + run: | + ls -la ${{ github.workspace }}/packages/profiling-node/lib/ - name: Restore tarball cache uses: actions/cache/restore@v4 From 35b3be2eb977b55b7a60fb55e7f6bb483743b71d Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 1 Aug 2024 22:17:23 -0400 Subject: [PATCH 20/22] upgrade other non profiling actions --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e7b3471d759..fbb22597b571 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -709,7 +709,7 @@ jobs: working-directory: dev-packages/browser-integration-tests run: yarn test:ci${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard && format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }} - name: Upload Playwright Traces - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: playwright-traces @@ -774,7 +774,7 @@ jobs: cd dev-packages/browser-integration-tests yarn test:loader - name: Upload Playwright Traces - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: playwright-traces From 178cd2c9f440e39b696ec5be8176253966bda6fd Mon Sep 17 00:00:00 2001 From: JonasBa Date: Fri, 2 Aug 2024 07:43:55 -0400 Subject: [PATCH 21/22] Revert "upgrade other non profiling actions" This reverts commit 35b3be2eb977b55b7a60fb55e7f6bb483743b71d. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbb22597b571..3e7b3471d759 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -709,7 +709,7 @@ jobs: working-directory: dev-packages/browser-integration-tests run: yarn test:ci${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard && format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }} - name: Upload Playwright Traces - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 if: always() with: name: playwright-traces @@ -774,7 +774,7 @@ jobs: cd dev-packages/browser-integration-tests yarn test:loader - name: Upload Playwright Traces - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 if: always() with: name: playwright-traces From 0322ee70eff663efecd6fb4de54168127ca2abd2 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Fri, 2 Aug 2024 07:49:11 -0400 Subject: [PATCH 22/22] remove binary log step --- .github/workflows/build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e7b3471d759..ab6880427c41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -937,10 +937,6 @@ jobs: path: ${{ github.workspace }}/packages/profiling-node/lib/ merge-multiple: true - - name: Log downloaded binaries - run: | - ls -la ${{ github.workspace }}/packages/profiling-node/lib/ - - name: Build Profiling tarball run: yarn build:tarball # End rebuild profiling @@ -1263,11 +1259,6 @@ jobs: pattern: profiling-node-binaries-${{ github.sha }}-* path: ${{ github.workspace }}/packages/profiling-node/lib/ merge-multiple: true - - - name: Log downloaded binaries - run: | - ls -la ${{ github.workspace }}/packages/profiling-node/lib/ - - name: Restore tarball cache uses: actions/cache/restore@v4 with: