Use ubuntu-22.04 for the CI and update Dockerfiles

This commit is contained in:
Maschell 2022-09-04 09:51:04 +02:00
parent add8b4b392
commit bf8d300588
5 changed files with 13 additions and 13 deletions

View File

@ -4,14 +4,14 @@ on: [pull_request]
jobs: jobs:
clang-format-lib: clang-format-lib:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: clang-format - name: clang-format
run: | run: |
docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries
build-lib: build-lib:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
needs: clang-format-lib needs: clang-format-lib
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -22,16 +22,16 @@ jobs:
- uses: actions/upload-artifact@master - uses: actions/upload-artifact@master
with: with:
name: binary name: binary
path: "/lib/*.a" path: "lib/*.a"
clang-format-examples: clang-format-examples:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: clang-format - name: clang-format
run: | run: |
docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src
build-examples: build-examples:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
needs: clang-format-examples needs: clang-format-examples
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -5,14 +5,14 @@ on:
- master - master
jobs: jobs:
clang-format-lib: clang-format-lib:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: clang-format - name: clang-format
run: | run: |
docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries
build-lib: build-lib:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
needs: clang-format-lib needs: clang-format-lib
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -21,14 +21,14 @@ jobs:
docker build . -f Dockerfile.buildlocal -t builder docker build . -f Dockerfile.buildlocal -t builder
docker run --rm -v ${PWD}:/project builder make docker run --rm -v ${PWD}:/project builder make
clang-format-examples: clang-format-examples:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: clang-format - name: clang-format
run: | run: |
docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src
build-examples: build-examples:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
needs: clang-format-examples needs: clang-format-examples
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -1,4 +1,4 @@
FROM wiiuenv/devkitppc:20220724 FROM wiiuenv/devkitppc:20220806
WORKDIR tmp_build WORKDIR tmp_build
COPY . . COPY . .

View File

@ -1,4 +1,4 @@
FROM wiiuenv/devkitppc:20220724 FROM wiiuenv/devkitppc:20220806
WORKDIR tmp_build WORKDIR tmp_build
COPY . . COPY . .
@ -8,7 +8,7 @@ WORKDIR /artifacts
FROM scratch as libwups FROM scratch as libwups
COPY --from=0 /artifacts /artifacts COPY --from=0 /artifacts /artifacts
FROM wiiuenv/devkitppc:20220724 FROM wiiuenv/devkitppc:20220806
COPY --from=libwups /artifacts $DEVKITPRO COPY --from=libwups /artifacts $DEVKITPRO

View File

@ -1,3 +1,3 @@
FROM wiiuenv/devkitppc:20220724 FROM wiiuenv/devkitppc:20220806
WORKDIR project WORKDIR project