Skip to content

Commit ff7d432

Browse files
committed
proper fix build???
This hopefully properly fixes this...
1 parent 49ed411 commit ff7d432

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ env:
4949
${{ github.workspace }}/packages/utils/esm
5050
5151
BUILD_CACHE_KEY: build-cache-${{ github.event.inputs.commit || github.sha }}
52-
BUILD_PROFILING_NODE_CACHE_TARBALL_KEY: profiling-node-tarball-${{ github.event.inputs.commit || github.sha }}
52+
BUILD_CACHE_TARBALL_KEY: tarball-${{ github.event.inputs.commit || github.sha }}
5353

5454
# GH will use the first restore-key it finds that matches
5555
# So it will start by looking for one from the same branch, else take the newest one it can find elsewhere
@@ -402,16 +402,9 @@ jobs:
402402
uses: ./.github/actions/restore-cache
403403
env:
404404
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
405-
- name: Pack tarballs
406-
# Profiling tarball is built separately as we assemble the precompiled binaries
407-
run: yarn build:tarball --ignore @sentry/profiling-node
408405

409-
- name: Restore profiling tarball
410-
uses: actions/cache/restore@v4
411-
with:
412-
key: ${{ env.BUILD_PROFILING_NODE_CACHE_TARBALL_KEY }}
413-
path: ${{ github.workspace }}/packages/profiling-node/*.tgz
414-
fail-on-cache-miss: true
406+
- name: Pack tarballs
407+
run: yarn build:tarball
415408

416409
- name: Archive artifacts
417410
uses: actions/upload-artifact@v4
@@ -986,8 +979,6 @@ jobs:
986979
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
987980
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
988981
restore-keys: ${{ env.NX_CACHE_RESTORE_KEYS }}
989-
- name: Build tarballs
990-
run: yarn build:tarball --ignore @sentry/profiling-node
991982

992983
# Rebuild profiling by compiling TS and pull the precompiled binary artifacts
993984
- name: Build Profiling Node
@@ -1002,21 +993,22 @@ jobs:
1002993
# https://github.com/actions/upload-artifact/issues/478
1003994
if: |
1004995
(needs.job_get_metadata.outputs.changed_profiling_node_bindings == 'true') ||
996+
(needs.job_get_metadata.outputs.is_release == 'true') ||
1005997
(github.event_name != 'pull_request')
1006998
uses: actions/download-artifact@v3
1007999
with:
10081000
name: profiling-node-binaries-${{ github.sha }}
10091001
path: ${{ github.workspace }}/packages/profiling-node/lib/
10101002

10111003
- name: Build Profiling tarball
1012-
run: yarn build:tarball --scope @sentry/profiling-node
1004+
run: yarn build:tarball
10131005
# End rebuild profiling
10141006

10151007
- name: Stores tarballs in cache
10161008
uses: actions/cache/save@v4
10171009
with:
1018-
path: ${{ github.workspace }}/packages/profiling-node/*.tgz
1019-
key: ${{ env.BUILD_PROFILING_NODE_CACHE_TARBALL_KEY }}
1010+
path: ${{ github.workspace }}/packages/*/*.tgz
1011+
key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
10201012

10211013
job_e2e_tests:
10221014
name: E2E ${{ matrix.label || matrix.test-application }} Test
@@ -1108,6 +1100,12 @@ jobs:
11081100
env:
11091101
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
11101102

1103+
- name: Restore tarball cache
1104+
uses: actions/cache/restore@v4
1105+
with:
1106+
path: ${{ github.workspace }}/packages/*/*.tgz
1107+
key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
1108+
11111109
- name: Get node version
11121110
id: versions
11131111
run: |
@@ -1201,8 +1199,8 @@ jobs:
12011199
- name: Restore tarball cache
12021200
uses: actions/cache/restore@v4
12031201
with:
1204-
path: ${{ github.workspace }}/packages/profiling-node/*.tgz
1205-
key: ${{ env.BUILD_PROFILING_NODE_CACHE_TARBALL_KEY }}
1202+
path: ${{ github.workspace }}/packages/*/*.tgz
1203+
key: ${{ env.BUILD_CACHE_TARBALL_KEY }}
12061204
fail-on-cache-miss : true
12071205

12081206
- name: Get node version

0 commit comments

Comments
 (0)