Update CI target OSes

Remove platforms deprecated by GitHub Actions
Add new platforms supported by the same
This commit is contained in:
ISSOtm
2022-10-01 18:25:36 +02:00
committed by Rangi
parent bbe28faab4
commit 80a62a8a03
4 changed files with 13 additions and 25 deletions

View File

@@ -6,7 +6,7 @@ on:
jobs: jobs:
windows: windows:
runs-on: windows-2019 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Get version from tag - name: Get version from tag

View File

@@ -7,7 +7,7 @@ on:
jobs: jobs:
build: build:
if: github.repository_owner == 'gbdev' if: github.repository_owner == 'gbdev'
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout rgbds@release - name: Checkout rgbds@release
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -18,17 +18,10 @@ jobs:
with: with:
repository: ${{ github.repository_owner }}/rgbds-www repository: ${{ github.repository_owner }}/rgbds-www
path: rgbds-www path: rgbds-www
# `-O toc` was added in 1.14.5, but the repos only have 1.14.4 - name: Install groff and mandoc
- name: Build and install mandoc + install groff
run: | run: |
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -yq groff zlib1g-dev sudo apt-get install -yq groff mandoc
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
- name: Update pages - name: Update pages
working-directory: rgbds/man working-directory: rgbds/man
run: | # The ref appears to be in the format "refs/tags/<version>", so strip that run: | # The ref appears to be in the format "refs/tags/<version>", so strip that

View File

@@ -7,7 +7,7 @@ jobs:
unix-testing: unix-testing:
strategy: strategy:
matrix: 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] cc: [gcc, clang]
buildsys: [make, cmake] buildsys: [make, cmake]
exclude: exclude:
@@ -64,6 +64,7 @@ jobs:
strategy: strategy:
matrix: matrix:
bits: [32, 64] bits: [32, 64]
os: [windows-2019, windows-2022]
include: include:
- bits: 32 - bits: 32
arch: x86 arch: x86
@@ -72,7 +73,7 @@ jobs:
arch: x86_x64 arch: x86_x64
platform: x64 platform: x64
fail-fast: false fail-fast: false
runs-on: windows-2019 runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Get zlib, libpng and bison - name: Get zlib, libpng and bison
@@ -149,7 +150,6 @@ jobs:
strategy: strategy:
matrix: matrix:
bits: [32, 64] bits: [32, 64]
os: [ubuntu-18.04]
include: include:
- bits: 32 - bits: 32
arch: i686 arch: i686
@@ -158,7 +158,7 @@ jobs:
arch: x86-64 arch: x86-64
triplet: x86_64-w64-mingw32 triplet: x86_64-w64-mingw32
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ubuntu-latest
env: env:
DIST_DIR: win${{ matrix.bits }} DIST_DIR: win${{ matrix.bits }}
steps: steps:
@@ -205,9 +205,10 @@ jobs:
needs: windows-xbuild needs: windows-xbuild
strategy: strategy:
matrix: matrix:
os: [windows-2019, windows-2022]
bits: [32, 64] bits: [32, 64]
fail-fast: false fail-fast: false
runs-on: windows-2019 runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Retrieve binaries - name: Retrieve binaries

View File

@@ -17,7 +17,7 @@ on:
jobs: jobs:
build: build:
if: github.repository_owner == 'gbdev' if: github.repository_owner == 'gbdev'
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout rgbds@master - name: Checkout rgbds@master
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -31,16 +31,10 @@ jobs:
repository: gbdev/rgbds-www repository: gbdev/rgbds-www
ref: master ref: master
path: rgbds-www path: rgbds-www
- name: Build and install mandoc + install groff - name: Install groff and mandoc
run: | run: |
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -yq groff zlib1g-dev sudo apt-get install -yq groff mandoc
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
- name: Update pages - name: Update pages
working-directory: rgbds/man working-directory: rgbds/man
run: | run: |