Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/nix-build-and-upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
jobs:
x86_64-darwin:
name: Build p4-fusion x86_64-darwin
runs-on: macos-latest
runs-on: macos-15-intel
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v8
- uses: DeterminateSystems/nix-installer-action@v22
- name: '🔓 Authenticate to Google Cloud'
uses: google-github-actions/auth@v1
with:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: macos-latest-xlarge
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/nix-installer-action@v22
- name: '🔓 Authenticate to Google Cloud'
uses: google-github-actions/auth@v1
with:
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/nix-installer-action@v22
- name: '🔓 Authenticate to Google Cloud'
uses: google-github-actions/auth@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-auditor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ jobs:
report_failure:
needs: check-pr
if: ${{ failure() }}
uses: sourcegraph/sourcegraph/.github/workflows/report-job-failure.yml@main
uses: sourcegraph/workflows/.github/workflows/report-job-failure.yml@main
secrets: inherit
11 changes: 6 additions & 5 deletions .github/workflows/validate-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ env:
P4USER: "admin" # the name of the Perforce user
P4PASSWD: ${{ secrets.P4PASSWD }} # the ticket for the Perforce user

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

Expand All @@ -42,6 +42,9 @@ jobs:
validate-migration:
strategy:
fail-fast: false
# The shared Perforce server only has two client license slots available
# for validation jobs.
max-parallel: 2
matrix:
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
- addressAndUndefinedSanitizer # https://github.com/google/sanitizers/wiki/AddressSanitizer and https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
Expand Down Expand Up @@ -166,9 +169,7 @@ jobs:
- uses: actions/checkout@v2

- name: "Run sccache"
uses: mozilla-actions/sccache-action@v0.0.3
with:
version: "v0.6.0"
uses: mozilla-actions/sccache-action@v0.0.10

- name: "Install Perforce CLI"
uses: perforce/setup-p4@1.0.2
Expand Down
6 changes: 3 additions & 3 deletions nix/helix-core-api.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
aarch64-darwin = fetchzip {
name = "helix-core-api";
url = "https://filehost.perforce.com/perforce/r23.1/bin.macosx12arm64/p4api-openssl1.1.1.tgz";
hash = "sha256-3j3WnBdfTa9job+w8mzcAltO8wgbMlxA/aJxWlLn/Dk=";
hash = "sha256-oUzpbJhcDEgJ5gxQ2dHZ/M2hhWTj0p4Pv9iL6GOvCXY=";
};
x86_64-darwin = fetchzip {
name = "helix-core-api";
url = "https://filehost.perforce.com/perforce/r23.1/bin.macosx12x86_64/p4api-openssl1.1.1.tgz";
hash = "sha256-go7uhe6eAX+rnnn5zzmKPya93ZK65q6bL0nsDXLx0ZA=";
hash = "sha256-1HQXcF/3lRv5H2L2IKvWNyYYY6myTOSTttIl46UBTfY=";
};
x86_64-linux = fetchzip {
name = "helix-core-api";
url = "https://filehost.perforce.com/perforce/r23.1/bin.linux26x86_64/p4api-glibc2.3-openssl1.1.1.tgz";
hash = "sha256-8Nv2xbXEYrheS930zyozSqMuC7X2V81IWW2woD/jqB4=";
hash = "sha256-891vpiR0Ni3ntdHvsQ4hviS/et2YKDBgIg3bGQ0xFI0=";
};
};
"3.0" = {
Expand Down
Loading