Skip to content

Commit ebf0910

Browse files
authored
Fix CI (#49)
CI was pretty broken. This fixes it.
1 parent 68ce3f2 commit ebf0910

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

.github/workflows/nix-build-and-upload.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
jobs:
1010
x86_64-darwin:
1111
name: Build p4-fusion x86_64-darwin
12-
runs-on: macos-latest
12+
runs-on: macos-15-intel
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: DeterminateSystems/nix-installer-action@v8
15+
- uses: DeterminateSystems/nix-installer-action@v22
1616
- name: '🔓 Authenticate to Google Cloud'
1717
uses: google-github-actions/auth@v1
1818
with:
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: macos-latest-xlarge
4646
steps:
4747
- uses: actions/checkout@v4
48-
- uses: DeterminateSystems/nix-installer-action@main
48+
- uses: DeterminateSystems/nix-installer-action@v22
4949
- name: '🔓 Authenticate to Google Cloud'
5050
uses: google-github-actions/auth@v1
5151
with:
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
steps:
8080
- uses: actions/checkout@v4
81-
- uses: DeterminateSystems/nix-installer-action@main
81+
- uses: DeterminateSystems/nix-installer-action@v22
8282
- name: '🔓 Authenticate to Google Cloud'
8383
uses: google-github-actions/auth@v1
8484
with:

.github/workflows/pr-auditor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
report_failure:
2424
needs: check-pr
2525
if: ${{ failure() }}
26-
uses: sourcegraph/sourcegraph/.github/workflows/report-job-failure.yml@main
26+
uses: sourcegraph/workflows/.github/workflows/report-job-failure.yml@main
2727
secrets: inherit

.github/workflows/validate-migration.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ env:
2626
P4USER: "admin" # the name of the Perforce user
2727
P4PASSWD: ${{ secrets.P4PASSWD }} # the ticket for the Perforce user
2828

29-
# Setup: Enable sccache for faster builds
30-
SCCACHE_GHA_ENABLED: "true"
29+
# Setup: Enable local sccache for faster builds. Do not make compilation
30+
# depend on the availability of GitHub's remote artifact cache.
3131
CMAKE_C_COMPILER_LAUNCHER: "sccache"
3232
CMAKE_CXX_COMPILER_LAUNCHER: "sccache"
3333

@@ -42,6 +42,9 @@ jobs:
4242
validate-migration:
4343
strategy:
4444
fail-fast: false
45+
# The shared Perforce server only has two client license slots available
46+
# for validation jobs.
47+
max-parallel: 2
4548
matrix:
4649
tool: # Note: If you add or change the name of tools here, you must also adjust the logic in the "Prepare environment for specific tool" step
4750
- addressAndUndefinedSanitizer # https://github.com/google/sanitizers/wiki/AddressSanitizer and https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
@@ -166,9 +169,7 @@ jobs:
166169
- uses: actions/checkout@v2
167170

168171
- name: "Run sccache"
169-
uses: mozilla-actions/sccache-action@v0.0.3
170-
with:
171-
version: "v0.6.0"
172+
uses: mozilla-actions/sccache-action@v0.0.10
172173

173174
- name: "Install Perforce CLI"
174175
uses: perforce/setup-p4@1.0.2

nix/helix-core-api.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
aarch64-darwin = fetchzip {
55
name = "helix-core-api";
66
url = "https://filehost.perforce.com/perforce/r23.1/bin.macosx12arm64/p4api-openssl1.1.1.tgz";
7-
hash = "sha256-3j3WnBdfTa9job+w8mzcAltO8wgbMlxA/aJxWlLn/Dk=";
7+
hash = "sha256-oUzpbJhcDEgJ5gxQ2dHZ/M2hhWTj0p4Pv9iL6GOvCXY=";
88
};
99
x86_64-darwin = fetchzip {
1010
name = "helix-core-api";
1111
url = "https://filehost.perforce.com/perforce/r23.1/bin.macosx12x86_64/p4api-openssl1.1.1.tgz";
12-
hash = "sha256-go7uhe6eAX+rnnn5zzmKPya93ZK65q6bL0nsDXLx0ZA=";
12+
hash = "sha256-1HQXcF/3lRv5H2L2IKvWNyYYY6myTOSTttIl46UBTfY=";
1313
};
1414
x86_64-linux = fetchzip {
1515
name = "helix-core-api";
1616
url = "https://filehost.perforce.com/perforce/r23.1/bin.linux26x86_64/p4api-glibc2.3-openssl1.1.1.tgz";
17-
hash = "sha256-8Nv2xbXEYrheS930zyozSqMuC7X2V81IWW2woD/jqB4=";
17+
hash = "sha256-891vpiR0Ni3ntdHvsQ4hviS/et2YKDBgIg3bGQ0xFI0=";
1818
};
1919
};
2020
"3.0" = {

0 commit comments

Comments
 (0)