From 39c6f0938cea7418f7f4f96a41e7878ce3074174 Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Sat, 2 Mar 2024 16:06:31 +0100 Subject: [PATCH] GHA FreeBSD: Switch to latest cross-platform-action and a Linux host --- .github/workflows/build_release_template.yml | 7 ++++--- .github/workflows/test_release.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml index 4a673439..2b0ad631 100644 --- a/.github/workflows/build_release_template.yml +++ b/.github/workflows/build_release_template.yml @@ -131,7 +131,7 @@ jobs: - os: windows-2019 target: windows # FreeBSD is built on an additional VM - - os: macos-12 + - os: ubuntu-latest target: freebsd steps: @@ -266,11 +266,12 @@ jobs: # - name: Run build_all.d for FreeBSD in a dedicated VM if: matrix.target == 'freebsd' - uses: cross-platform-actions/action@v0.22.0 + uses: cross-platform-actions/action@v0.23.0 with: operating_system: freebsd hypervisor: qemu - memory: 8G + memory: 12G + cpu_count: 4 version: '13.2' shell: bash run: | diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index a21435e4..da83e100 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -38,7 +38,7 @@ jobs: - host: ubuntu-latest os: linux build: dmd.${{ github.base_ref || github.ref_name }}.linux.tar.xz - - host: macos-12 + - host: ubuntu-latest os: freebsd build: dmd.${{ github.base_ref || github.ref_name }}.freebsd-64.tar.xz @@ -68,11 +68,12 @@ jobs: - name: Check ${{ matrix.os }} artifacts in a VM if: ${{ matrix.os == 'freebsd' }} - uses: cross-platform-actions/action@v0.21.1 + uses: cross-platform-actions/action@v0.23.0 with: operating_system: freebsd hypervisor: qemu - memory: 8G + memory: 12G + cpu_count: 4 version: '12.2' environment_variables: OS BUILD shell: bash