From bea7b2efdfc78c0d16daf4270c984cda3e1dc192 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 03:05:43 -0500 Subject: [PATCH 01/13] test if lact builds --- .github/workflows/build-and-cache.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index af1a632..a78720c 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,11 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/a9c7c4c52da181e7c66156c61b65c39f567efb41#gollum - - github:cything/nixpkgs/a9c7c4c52da181e7c66156c61b65c39f567efb41#gollum.tests.gollum - - github:cything/nixpkgs/e1e065c4bd58bef677474a828c4673c643f99545#schismtracker - - github:cything/nixpkgs/d23ce3cde5a3d6ad84b4726f12391c39c04a0601#museum - - github:cything/nixpkgs/b4f2fc5c507a60d92503a2def27cfebdfb1942d5#ente-auth + - github:cything/nixpkgs/7c18b2be3917f32009a4a75ac6a3a91f43b7b85b#lact os: - ubuntu-latest - macos-latest From f76ce26f9af3b68f33b22dc3c73107497a0481c4 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 05:59:29 -0500 Subject: [PATCH 02/13] build alvr now --- .github/workflows/build-and-cache.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index a78720c..da742b6 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -8,6 +8,7 @@ jobs: matrix: package: - github:cything/nixpkgs/7c18b2be3917f32009a4a75ac6a3a91f43b7b85b#lact + - github:cything/nixpkgs/6df18358cf9444e228575b9d91189b9836d9be0e#schismtracker os: - ubuntu-latest - macos-latest From 63b32927a363cd72aa187e333058206e248908c3 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 15:30:51 -0500 Subject: [PATCH 03/13] new lact --- .github/workflows/build-and-cache.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index da742b6..c1567fb 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,8 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/7c18b2be3917f32009a4a75ac6a3a91f43b7b85b#lact - - github:cything/nixpkgs/6df18358cf9444e228575b9d91189b9836d9be0e#schismtracker + - github:cything/nixpkgs/7dfb91f744fbeabacc3b07449283903fb4c10d54#lact os: - ubuntu-latest - macos-latest From 6f7a4c0f674d44d60f7dd5456148320eb6165a51 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 15:55:44 -0500 Subject: [PATCH 04/13] make workflow faster --- .github/workflows/build-and-cache.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index c1567fb..d6668ab 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/7dfb91f744fbeabacc3b07449283903fb4c10d54#lact + - github:cything/nixpkgs/f27dce2c9bbee2d57b3a08d16bdf89bfaab613bd#lact os: - ubuntu-latest - macos-latest @@ -18,15 +18,10 @@ jobs: with: logger: pretty - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@v15 - with: - name: cything - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - uses: actions/checkout@v4 - run: nix build '${{ matrix.package }}' From 4e3048ee5b483dfc4175e0e699b84fea4848464b Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:05:43 -0500 Subject: [PATCH 05/13] add patch to remove nvidia tests --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index d6668ab..c90f6ad 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/f27dce2c9bbee2d57b3a08d16bdf89bfaab613bd#lact + - github:cything/nixpkgs/08353cfca6564677fa1c4876181ade8520ba4456#lact os: - ubuntu-latest - macos-latest From 77678b720f5c544c2fa7964ef60ee3969338f464 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:19:33 -0500 Subject: [PATCH 06/13] enable full logs on workflow --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index c90f6ad..4bb679c 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -24,4 +24,4 @@ jobs: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - run: nix build '${{ matrix.package }}' + - run: nix build -L '${{ matrix.package }}' From 086f8ea6c1a4b2a501fcb4d1436f9a1b00057c67 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:34:29 -0500 Subject: [PATCH 07/13] add more libraries --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 4bb679c..455a63c 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/08353cfca6564677fa1c4876181ade8520ba4456#lact + - github:cything/nixpkgs/b96071e1308558fd227f27db93bc4fda4f4c188e#lact os: - ubuntu-latest - macos-latest From 8f64c252fd41d64d7cebd4a7056ef4505a58b7f6 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:45:02 -0500 Subject: [PATCH 08/13] add libdrm_nouveau.so --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 455a63c..da9e42a 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/b96071e1308558fd227f27db93bc4fda4f4c188e#lact + - github:cything/nixpkgs/d89cb92a38516c06964fbd814767c9936edaeb4d#lact os: - ubuntu-latest - macos-latest From 4f545ba6de087d08c89fe19d7e539b7f903093af Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:48:57 -0500 Subject: [PATCH 09/13] cache rust stuff --- .github/workflows/build-and-cache.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index da9e42a..32b0739 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -17,6 +17,19 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: logger: pretty + + # use sccache for Rust + - name: Run sccache-cache + if: (env.SCCACHE_GHA_ENABLED == 'true') + uses: mozilla-actions/sccache-action@main + + # use rust-cache + - uses: Swatinem/rust-cache@v2 + with: + cache-all-crates: "true" + cache-on-failure: "true" + cache-targets: "true" + - uses: DeterminateSystems/magic-nix-cache-action@main - name: Setup Attic cache uses: ryanccn/attic-action@v0 From d36998ec99be0559fe0ac9286523a11306fa5139 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:51:01 -0500 Subject: [PATCH 10/13] Revert "cache rust stuff" This reverts commit 4f545ba6de087d08c89fe19d7e539b7f903093af. --- .github/workflows/build-and-cache.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 32b0739..da9e42a 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -17,19 +17,6 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: logger: pretty - - # use sccache for Rust - - name: Run sccache-cache - if: (env.SCCACHE_GHA_ENABLED == 'true') - uses: mozilla-actions/sccache-action@main - - # use rust-cache - - uses: Swatinem/rust-cache@v2 - with: - cache-all-crates: "true" - cache-on-failure: "true" - cache-targets: "true" - - uses: DeterminateSystems/magic-nix-cache-action@main - name: Setup Attic cache uses: ryanccn/attic-action@v0 From 70f6cb35fb8d559e09cfe2804641665a3457c372 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 16:58:11 -0500 Subject: [PATCH 11/13] add radeon and dont patch nvidia --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index da9e42a..45ee444 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/d89cb92a38516c06964fbd814767c9936edaeb4d#lact + - github:cything/nixpkgs/fbe693f5b038829ad10162ab845d11b6e6fd4457#lact os: - ubuntu-latest - macos-latest From 9c5e6db96bf6c9c83a28083a1d7db2d66e50b89a Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 17:10:19 -0500 Subject: [PATCH 12/13] enable nvidia tests patch --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 45ee444..1f1ea7f 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/fbe693f5b038829ad10162ab845d11b6e6fd4457#lact + - github:cything/nixpkgs/9628f63a0c7288c22071d33d6efb7007a1647141#lact os: - ubuntu-latest - macos-latest From defa9aa7233b78ccffe8b905c6f0b90723007c7f Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 18 Jan 2025 17:22:40 -0500 Subject: [PATCH 13/13] also patch amd tests --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 1f1ea7f..aca9d1e 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/9628f63a0c7288c22071d33d6efb7007a1647141#lact + - github:cything/nixpkgs/fd06e41125350bc3db5628df49d3b84e4652a59d#lact os: - ubuntu-latest - macos-latest