diff --git a/.cirrus.yml b/.cirrus.yml index 7aa949277a2c..94c9e2acb0fa 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -53,17 +53,17 @@ coverage_environment_template: &COVERAGE_ENVIRONMENT_TEMPLATE CODECOV_TOKEN: ENCRYPTED[cc6ce01618eaee6c9a08ebc81446a9233588df3b2c6ba4e30ffb7715ee9815734ccfd9fcec4f6abfc6a1b9dd8253110d] # FreeBSD -freebsd13_task: - name: FreeBSD 13.0 x64, DMD ($TASK_NAME_TYPE) +freebsd14_task: + name: FreeBSD 14.4 x64, DMD ($TASK_NAME_TYPE) allow_failures: true # might be out of credits freebsd_instance: - image_family: freebsd-13-0 + image_family: freebsd-14-4 cpu: 4 memory: 8G timeout_in: 60m environment: OS_NAME: freebsd - CI_DFLAGS: -version=TARGET_FREEBSD13 + CI_DFLAGS: -version=TARGET_FREEBSD14 matrix: - TASK_NAME_TYPE: coverage << : *COVERAGE_ENVIRONMENT_TEMPLATE diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad8eff8fab70..49b36d331434 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -187,11 +187,11 @@ jobs: fail-fast: false matrix: include: - - job_name: FreeBSD 13.2 x64, DMD (latest) - freebsd_version: '13.2' + - job_name: FreeBSD 14.4 x64, DMD (latest) + freebsd_version: '14.4' host_dmd: dmd - - job_name: FreeBSD 13.2 x64, DMD (bootstrap) - freebsd_version: '13.2' + - job_name: FreeBSD 14.4 x64, DMD (bootstrap) + freebsd_version: '14.4' host_dmd: dmd-2.095.0 name: ${{ matrix.job_name }} runs-on: ubuntu-latest @@ -200,19 +200,20 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 50 - - name: Run in VM - uses: cross-platform-actions/action@v0.23.0 - timeout-minutes: 19 + - name: Start VM + uses: cross-platform-actions/action@v1.3.0 with: operating_system: freebsd - hypervisor: qemu memory: 12G cpu_count: 4 sync_files: runner-to-vm version: ${{ matrix.freebsd_version }} shell: bash - run: | - set -uexo pipefail + - name: Run in VM + timeout-minutes: 19 + shell: cpa.sh {0} --sync-files runner-to-vm + run: | + set -uexo pipefail freebsd_version='${{ matrix.freebsd_version }}' freebsd_major="${freebsd_version:0:2}" diff --git a/ci/README.md b/ci/README.md index 6e8d9caa2863..e78b280e7b1c 100644 --- a/ci/README.md +++ b/ci/README.md @@ -148,9 +148,9 @@ These should be taken seriously, since untested code is likely to introduce bugs **Config**: [.cirrus.yml](https://github.com/dlang/dmd/blob/master/.cirrus.yml) **Checks**: -- FreeBSD 12.3 x64, DMD (bootstrap) -- FreeBSD 13.0 x64, DMD (coverage) -- FreeBSD 13.0 x64, DMD (latest) +- FreeBSD 14.3 x64, DMD (bootstrap) +- FreeBSD 14.3 x64, DMD (coverage) +- FreeBSD 14.3 x64, DMD (latest) - Ubuntu 22.04 x64, DMD (bootstrap) - Ubuntu 22.04 x64, DMD (latest) - Ubuntu 22.04 x64, GDC