From 82fb818a28449ddbd651c907bf74f111e3951987 Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Tue, 5 Dec 2023 03:43:42 +0100 Subject: [PATCH] CI: Migrate from vmactions/freebsd-vm action to cross-platform-actions/action As used by DMD & Phobos CI. --- .github/workflows/build_release_template.yml | 13 ++++++++----- .github/workflows/test_release.yml | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml index 8fc3dcb6..9f3075e8 100644 --- a/.github/workflows/build_release_template.yml +++ b/.github/workflows/build_release_template.yml @@ -266,15 +266,18 @@ jobs: # - name: Run build_all.d for FreeBSD in a dedicated VM if: matrix.target == 'freebsd' - uses: vmactions/freebsd-vm@v0.2.9 + uses: cross-platform-actions/action@v0.21.1 with: - usesh: true - # Need more RAM than the default 1G - mem: 4096 - prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync llvm90 + operating_system: freebsd + hypervisor: qemu + memory: 8G + version: '13.2' + shell: bash run: | set -eux + sudo pkg install -y curl curlpp git gmake pkgconf gnupg rsync llvm90 + # Import key used to sign binaries curl https://dlang.org/d-keyring.gpg -o d-keyring.gpg gpg d-keyring.gpg diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index 313019ef..2e1f16fe 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -70,10 +70,12 @@ jobs: - name: Check ${{ matrix.os }} artifacts in a VM if: ${{ matrix.os == 'freebsd' }} - uses: cross-platform-actions/action@v0.6.2 + uses: cross-platform-actions/action@v0.21.1 with: operating_system: freebsd - version: 12.2 + hypervisor: qemu + memory: 8G + version: '12.2' environment_variables: OS BUILD shell: bash run: source ./installer/test/release/validate_release.sh