From e45b3b4d487d579fd3aed98d38e13a19f0b45453 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 10 Feb 2024 09:29:55 -0800 Subject: [PATCH 1/5] ci: test self-hosted x86 runners --- .github/workflows/nix.yml | 2 +- .github/workflows/test.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 3b40c5f98..c77db59e3 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,7 +2,7 @@ on: [push, pull_request] name: Nix jobs: check-zig-cache-hash: - runs-on: ubuntu-latest + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c0579cbc..b88db003c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md"] target: [ aarch64-linux, @@ -41,7 +41,7 @@ jobs: run: nix develop -c zig build -Dstatic=true -Dapp-runtime=glfw -Dtarget=${{ matrix.target }} build-linux-libghostty: - runs-on: ubuntu-latest + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md needs: test steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: run: nix develop -c zig build -Dapp-runtime=none build-nix: - runs-on: ubuntu-latest + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md needs: test steps: - name: Checkout code @@ -183,7 +183,7 @@ jobs: run: Get-Content -Path ".\build.log" test: - runs-on: ubuntu-latest + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md steps: - name: Checkout code uses: actions/checkout@v4 @@ -210,7 +210,7 @@ jobs: run: nix develop -c zig build -Dstatic=false prettier: - runs-on: ubuntu-latest + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - uses: cachix/install-nix-action@v24 @@ -224,7 +224,7 @@ jobs: run: nix develop -c prettier --check . alejandra: - runs-on: ubuntu-latest + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - uses: cachix/install-nix-action@v24 From e99b8d41343bcffc5e1cdf64be09c47b138558a0 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 10 Feb 2024 13:09:00 -0800 Subject: [PATCH 2/5] ci: try small instances --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b88db003c..b015f35b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md"] + os: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm"] target: [ aarch64-linux, @@ -41,7 +41,7 @@ jobs: run: nix develop -c zig build -Dstatic=true -Dapp-runtime=glfw -Dtarget=${{ matrix.target }} build-linux-libghostty: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm needs: test steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: run: nix develop -c zig build -Dapp-runtime=none build-nix: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm needs: test steps: - name: Checkout code @@ -183,7 +183,7 @@ jobs: run: Get-Content -Path ".\build.log" test: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm steps: - name: Checkout code uses: actions/checkout@v4 From e44338b1c08269e00f32469453cada1c40b2df68 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 10 Feb 2024 13:16:13 -0800 Subject: [PATCH 3/5] ci: no, build on mediums --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b015f35b5..b88db003c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm"] + os: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md"] target: [ aarch64-linux, @@ -41,7 +41,7 @@ jobs: run: nix develop -c zig build -Dstatic=true -Dapp-runtime=glfw -Dtarget=${{ matrix.target }} build-linux-libghostty: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md needs: test steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: run: nix develop -c zig build -Dapp-runtime=none build-nix: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md needs: test steps: - name: Checkout code @@ -183,7 +183,7 @@ jobs: run: Get-Content -Path ".\build.log" test: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm + runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md steps: - name: Checkout code uses: actions/checkout@v4 From 5ad1dab3cc0e131b042098a2a15d8c21546b1783 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 10 Feb 2024 13:36:09 -0800 Subject: [PATCH 4/5] ci: try namespace --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b88db003c..df8c96cf3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -210,7 +210,7 @@ jobs: run: nix develop -c zig build -Dstatic=false prettier: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm + runs-on: namespace-profile-default steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - uses: cachix/install-nix-action@v24 @@ -224,7 +224,7 @@ jobs: run: nix develop -c prettier --check . alejandra: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-sm + runs-on: namespace-profile-default steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - uses: cachix/install-nix-action@v24 From 1189a0974d4851e6be5a2270a5bb8cd6c422dd3d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 10 Feb 2024 13:41:41 -0800 Subject: [PATCH 5/5] ci: switch linux to namespace --- .github/workflows/release-tip.yml | 2 +- .github/workflows/test.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml index 56e2a8ae8..ef174b060 100644 --- a/.github/workflows/release-tip.yml +++ b/.github/workflows/release-tip.yml @@ -10,7 +10,7 @@ name: Release Tip jobs: tag: - runs-on: ubuntu-latest + runs-on: namespace-profile-ghostty-sm needs: [build-macos] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index df8c96cf3..8f27ff04d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md"] + os: ["namespace-profile-ghostty-md"] target: [ aarch64-linux, @@ -41,7 +41,7 @@ jobs: run: nix develop -c zig build -Dstatic=true -Dapp-runtime=glfw -Dtarget=${{ matrix.target }} build-linux-libghostty: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md + runs-on: namespace-profile-ghostty-md needs: test steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: run: nix develop -c zig build -Dapp-runtime=none build-nix: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md + runs-on: namespace-profile-ghostty-md needs: test steps: - name: Checkout code @@ -183,7 +183,7 @@ jobs: run: Get-Content -Path ".\build.log" test: - runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md + runs-on: namespace-profile-ghostty-md steps: - name: Checkout code uses: actions/checkout@v4 @@ -210,7 +210,7 @@ jobs: run: nix develop -c zig build -Dstatic=false prettier: - runs-on: namespace-profile-default + runs-on: namespace-profile-ghostty-sm steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - uses: cachix/install-nix-action@v24 @@ -224,7 +224,7 @@ jobs: run: nix develop -c prettier --check . alejandra: - runs-on: namespace-profile-default + runs-on: namespace-profile-ghostty-sm steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - uses: cachix/install-nix-action@v24