diff --git a/.github/workflows/create-release-artifacts.yaml b/.github/workflows/create-release-artifacts.yaml index 591c6696..78034009 100644 --- a/.github/workflows/create-release-artifacts.yaml +++ b/.github/workflows/create-release-artifacts.yaml @@ -6,7 +6,7 @@ on: jobs: windows: - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v2 - name: Get version from tag diff --git a/.github/workflows/create-release-docs.yml b/.github/workflows/create-release-docs.yml index 2ed643ae..4ba3f0a3 100644 --- a/.github/workflows/create-release-docs.yml +++ b/.github/workflows/create-release-docs.yml @@ -7,7 +7,7 @@ on: jobs: build: if: github.repository_owner == 'gbdev' - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout rgbds@release uses: actions/checkout@v2 @@ -18,17 +18,10 @@ jobs: with: repository: ${{ github.repository_owner }}/rgbds-www path: rgbds-www - # `-O toc` was added in 1.14.5, but the repos only have 1.14.4 - - name: Build and install mandoc + install groff + - name: Install groff and mandoc run: | sudo apt-get -qq update - sudo apt-get install -yq groff zlib1g-dev - wget 'http://mandoc.bsd.lv/snapshots/mandoc-1.14.6.tar.gz' - tar xf mandoc-1.14.6.tar.gz - cd mandoc-1.14.6 - ./configure - make - sudo make install + sudo apt-get install -yq groff mandoc - name: Update pages working-directory: rgbds/man run: | # The ref appears to be in the format "refs/tags/", so strip that diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6fab88ca..b3c8685b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -7,7 +7,7 @@ jobs: unix-testing: strategy: matrix: - os: [ubuntu-20.04, ubuntu-18.04, macos-11.0, macos-10.15] + os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12] cc: [gcc, clang] buildsys: [make, cmake] exclude: @@ -64,6 +64,7 @@ jobs: strategy: matrix: bits: [32, 64] + os: [windows-2019, windows-2022] include: - bits: 32 arch: x86 @@ -72,7 +73,7 @@ jobs: arch: x86_x64 platform: x64 fail-fast: false - runs-on: windows-2019 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - name: Get zlib, libpng and bison @@ -149,7 +150,6 @@ jobs: strategy: matrix: bits: [32, 64] - os: [ubuntu-18.04] include: - bits: 32 arch: i686 @@ -158,7 +158,7 @@ jobs: arch: x86-64 triplet: x86_64-w64-mingw32 fail-fast: false - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest env: DIST_DIR: win${{ matrix.bits }} steps: @@ -205,9 +205,10 @@ jobs: needs: windows-xbuild strategy: matrix: + os: [windows-2019, windows-2022] bits: [32, 64] fail-fast: false - runs-on: windows-2019 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - name: Retrieve binaries diff --git a/.github/workflows/update-master-docs.yml b/.github/workflows/update-master-docs.yml index af6f160c..3cc86e81 100644 --- a/.github/workflows/update-master-docs.yml +++ b/.github/workflows/update-master-docs.yml @@ -17,7 +17,7 @@ on: jobs: build: if: github.repository_owner == 'gbdev' - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout rgbds@master uses: actions/checkout@v2 @@ -31,16 +31,10 @@ jobs: repository: gbdev/rgbds-www ref: master path: rgbds-www - - name: Build and install mandoc + install groff + - name: Install groff and mandoc run: | sudo apt-get -qq update - sudo apt-get install -yq groff zlib1g-dev - wget 'http://mandoc.bsd.lv/snapshots/mandoc-1.14.6.tar.gz' - tar xf mandoc-1.14.6.tar.gz - cd mandoc-1.14.6 - ./configure - make - sudo make install + sudo apt-get install -yq groff mandoc - name: Update pages working-directory: rgbds/man run: |