From 6cde1a3ff700e73e7d0290764b4025c40fbf4187 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 13 Jun 2025 20:41:43 -1000 Subject: [PATCH] ci: more consistent images, image notes --- .github/workflows/_binaries-linux-arm32v7.yml | 1 + .github/workflows/_binaries-linux-arm64-stack.yml | 1 + .github/workflows/_binaries-linux-arm64.yml | 6 ++++-- .github/workflows/_binaries-linux-x64-stack.yml | 5 ++++- .github/workflows/_binaries-windows-arm64.yml | 4 ++++ .github/workflows/binaries-linux-x64.yml | 5 ++++- .github/workflows/binaries-mac-arm64.yml | 8 +++++++- .github/workflows/binaries-mac-x64.yml | 4 +++- .github/workflows/binaries-windows-x64.yml | 5 +++++ .github/workflows/ci.yml | 3 +++ .github/workflows/nightly.yml | 1 + .github/workflows/oldest.yml | 3 +++ .github/workflows/release.yml | 1 + 13 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_binaries-linux-arm32v7.yml b/.github/workflows/_binaries-linux-arm32v7.yml index 1781ff0d0..1e74dcfc8 100644 --- a/.github/workflows/_binaries-linux-arm32v7.yml +++ b/.github/workflows/_binaries-linux-arm32v7.yml @@ -11,6 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest + steps: - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/_binaries-linux-arm64-stack.yml b/.github/workflows/_binaries-linux-arm64-stack.yml index ccf38451b..9f3f75603 100644 --- a/.github/workflows/_binaries-linux-arm64-stack.yml +++ b/.github/workflows/_binaries-linux-arm64-stack.yml @@ -11,6 +11,7 @@ jobs: build: runs-on: ubuntu-latest container: alpine:latest + steps: - name: Show platform info diff --git a/.github/workflows/_binaries-linux-arm64.yml b/.github/workflows/_binaries-linux-arm64.yml index 0faa39830..7c968a11e 100644 --- a/.github/workflows/_binaries-linux-arm64.yml +++ b/.github/workflows/_binaries-linux-arm64.yml @@ -10,10 +10,12 @@ on: jobs: build: runs-on: ubuntu-24.04-arm + # arch: arm64 + # image: https://github.com/actions/partner-runner-images/blob/main/images/arm-ubuntu-24-image.md + # container: arm64v8/alpine:3.18 - # work around janky arm/alpine support - # https://github.com/actions/runner/issues/801#issuecomment-2394425757 container: + # work around janky arm/alpine support, https://github.com/actions/runner/issues/801#issuecomment-2394425757 image: arm64v8/alpine:3.18 volumes: - /:/host # Jailbreak! diff --git a/.github/workflows/_binaries-linux-x64-stack.yml b/.github/workflows/_binaries-linux-x64-stack.yml index 914021e12..29dc8f23a 100644 --- a/.github/workflows/_binaries-linux-x64-stack.yml +++ b/.github/workflows/_binaries-linux-x64-stack.yml @@ -12,8 +12,11 @@ on: workflow_dispatch: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 + # arch: x64 + # image: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md container: alpine:latest + steps: - name: Check out diff --git a/.github/workflows/_binaries-windows-arm64.yml b/.github/workflows/_binaries-windows-arm64.yml index ed6ae594a..5038bd6c4 100644 --- a/.github/workflows/_binaries-windows-arm64.yml +++ b/.github/workflows/_binaries-windows-arm64.yml @@ -12,9 +12,13 @@ on: jobs: build: runs-on: windows-11-arm + # arch: arm64 + # image: https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md + defaults: run: shell: bash + steps: - name: Check out diff --git a/.github/workflows/binaries-linux-x64.yml b/.github/workflows/binaries-linux-x64.yml index 0967992d2..1d438fa93 100644 --- a/.github/workflows/binaries-linux-x64.yml +++ b/.github/workflows/binaries-linux-x64.yml @@ -9,8 +9,11 @@ on: workflow_dispatch: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 + # arch: x64 + # image: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md container: alpine:latest + steps: - name: Check out diff --git a/.github/workflows/binaries-mac-arm64.yml b/.github/workflows/binaries-mac-arm64.yml index ef656cef4..d94bd2587 100644 --- a/.github/workflows/binaries-mac-arm64.yml +++ b/.github/workflows/binaries-mac-arm64.yml @@ -8,10 +8,14 @@ on: workflow_dispatch: jobs: build: - # arm64 runs-on: macos-14 + # arch: arm64 + # image: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md + env: + ghc: 9.12.2 stack: stack + steps: - name: Show platform info @@ -30,6 +34,8 @@ jobs: tools/checkembeddedfiles # caching + # XXX Should some of these have ghc version in the key, as in ci.yml ? + # I think so, otherwise when ghc version changes they'll keep restoring the old data and it won't be used or updated - name: Cache - stack-installed ~/.local/bin id: stack-programs diff --git a/.github/workflows/binaries-mac-x64.yml b/.github/workflows/binaries-mac-x64.yml index 004b40b78..07554ae7f 100644 --- a/.github/workflows/binaries-mac-x64.yml +++ b/.github/workflows/binaries-mac-x64.yml @@ -8,8 +8,10 @@ on: workflow_dispatch: jobs: build: - # x64 runs-on: macos-13 + # arch: x64 + # image: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md + env: stack: stack steps: diff --git a/.github/workflows/binaries-windows-x64.yml b/.github/workflows/binaries-windows-x64.yml index 2856dbb27..d9b395e88 100644 --- a/.github/workflows/binaries-windows-x64.yml +++ b/.github/workflows/binaries-windows-x64.yml @@ -9,12 +9,17 @@ on: jobs: build: runs-on: windows-latest + # arch: x64 + # image: + defaults: run: shell: bash + env: # use preinstalled ghc 9.12.2 stack: stack --system-ghc --no-install-ghc --stack-yaml stack912.yaml + steps: - name: Check out diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df509c548..3e87b94a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,9 @@ on: jobs: ci: runs-on: ubuntu-24.04 + # arch: x64 + # image: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md + env: # caching id for this ghc's build artifacts ghc: 910 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d263454c9..11b5dcc7c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,6 +11,7 @@ on: jobs: publish-binaries: runs-on: ubuntu-latest + steps: - name: Checkout repository diff --git a/.github/workflows/oldest.yml b/.github/workflows/oldest.yml index d3b1c0c42..2f9dce8be 100644 --- a/.github/workflows/oldest.yml +++ b/.github/workflows/oldest.yml @@ -13,6 +13,9 @@ on: jobs: oldest: runs-on: ubuntu-24.04 + # arch: x64 + # image: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md + env: # This workflow uses github's preinstalled ghc & stack on ubuntu. # Keep these synced with the latest ghc version at https://github.com/actions/runner-images/blob/ubuntu22/20240514.2/images/ubuntu/Ubuntu2404-Readme.md#haskell-tools diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1d422de3..69da994f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,7 @@ on: jobs: release: runs-on: ubuntu-latest + steps: - name: Checkout repository