Skip to content

Commit 356fa10

Browse files
authored
Merge pull request #175 from DeterminateSystems/provenance
Support provenance
2 parents 93bcd50 + 4579e8c commit 356fa10

File tree

10 files changed

+236
-180
lines changed

10 files changed

+236
-180
lines changed

.cargo/config.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[build]
2+
rustflags = [
3+
"-Clink-arg=-fuse-ld=lld",
4+
"-Crelocation-model=static",
5+
]
6+
7+
[target.aarch64-unknown-linux-musl]
8+
rustflags = [
9+
"-Clink-arg=-fuse-ld=lld",
10+
"-Crelocation-model=static",
11+
"-Clink-arg=-lgcc",
12+
]

.github/workflows/build.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ jobs:
1818
systems:
1919
- nix-system: x86_64-linux
2020
system: X64-Linux
21-
runner: ubuntu-22.04
21+
runner: UbuntuLatest32Cores128G
2222
- nix-system: aarch64-linux
2323
system: ARM64-Linux
24-
runner: namespace-profile-default-arm64
25-
- nix-system: x86_64-darwin
26-
system: X64-macOS
27-
runner: macos-latest-xlarge
24+
runner: UbuntuLatest32Cores128GArm
2825
- nix-system: aarch64-darwin
2926
system: ARM64-macOS
30-
runner: macos-latest-xlarge
27+
runner: namespace-profile-mac-m2-12c28g
3128
steps:
3229
- uses: actions/checkout@v4
3330
- name: Install Nix on ${{ matrix.systems.system }}

.github/workflows/check-and-test.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ jobs:
5151
runner: ubuntu-22.04
5252
- system: ARM64-Linux
5353
runner: namespace-profile-default-arm64
54-
- system: X64-macOS
55-
runner: macos-latest-xlarge
5654
- system: ARM64-macOS
5755
runner: macos-latest-xlarge
5856
permissions:

.github/workflows/release-branches.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ jobs:
3939
- name: Persist the cache binary
4040
run: cp ./cache-binary-ARM64-macOS/magic-nix-cache.closure.xz ./artifacts/ARM64-macOS
4141

42-
- uses: actions/download-artifact@v4.1.8
43-
with:
44-
name: magic-nix-cache-X64-macOS
45-
path: cache-binary-X64-macOS
46-
- name: Persist the cache binary
47-
run: cp ./cache-binary-X64-macOS/magic-nix-cache.closure.xz ./artifacts/X64-macOS
48-
4942
- uses: actions/download-artifact@v4.1.8
5043
with:
5144
name: magic-nix-cache-X64-Linux

.github/workflows/release-prs.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ jobs:
4343
- name: Persist the cache binary
4444
run: cp ./cache-binary-ARM64-macOS/magic-nix-cache.closure.xz ./artifacts/ARM64-macOS
4545

46-
- uses: actions/download-artifact@v4.1.8
47-
with:
48-
name: magic-nix-cache-X64-macOS
49-
path: cache-binary-X64-macOS
50-
- name: Persist the cache binary
51-
run: cp ./cache-binary-X64-macOS/magic-nix-cache.closure.xz ./artifacts/X64-macOS
52-
5346
- uses: actions/download-artifact@v4.1.8
5447
with:
5548
name: magic-nix-cache-X64-Linux

.github/workflows/release-tags.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ jobs:
3131
- name: Persist the cache binary
3232
run: cp ./cache-binary-ARM64-macOS/magic-nix-cache.closure.xz ./artifacts/ARM64-macOS
3333

34-
- uses: actions/download-artifact@v4.1.8
35-
with:
36-
name: magic-nix-cache-X64-macOS
37-
path: cache-binary-X64-macOS
38-
- name: Persist the cache binary
39-
run: cp ./cache-binary-X64-macOS/magic-nix-cache.closure.xz ./artifacts/X64-macOS
40-
4134
- uses: actions/download-artifact@v4.1.8
4235
with:
4336
name: magic-nix-cache-X64-Linux
@@ -63,7 +56,6 @@ jobs:
6356
- name: Rename binaries for GH release
6457
run: |
6558
mv ./artifacts/{,magic-nix-cache-closure-}ARM64-macOS
66-
mv ./artifacts/{,magic-nix-cache-closure-}X64-macOS
6759
mv ./artifacts/{,magic-nix-cache-closure-}X64-Linux
6860
mv ./artifacts/{,magic-nix-cache-closure-}ARM64-Linux
6961

Cargo.lock

Lines changed: 62 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)