From bf8d3005888517c321faf38945ca2ecd36a0e1c5 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 4 Sep 2022 09:51:04 +0200 Subject: [PATCH] Use ubuntu-22.04 for the CI and update Dockerfiles --- .github/workflows/pr.yml | 10 +++++----- .github/workflows/push_image.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile.buildexamples | 4 ++-- Dockerfile.buildlocal | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8dbfb71..f72a32a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,14 +4,14 @@ on: [pull_request] jobs: clang-format-lib: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: clang-format run: | docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries build-lib: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 needs: clang-format-lib steps: - uses: actions/checkout@v2 @@ -22,16 +22,16 @@ jobs: - uses: actions/upload-artifact@master with: name: binary - path: "/lib/*.a" + path: "lib/*.a" clang-format-examples: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: clang-format run: | docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src build-examples: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 needs: clang-format-examples steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml index 42df2d5..47f7cc2 100644 --- a/.github/workflows/push_image.yml +++ b/.github/workflows/push_image.yml @@ -5,14 +5,14 @@ on: - master jobs: clang-format-lib: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: clang-format run: | docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries build-lib: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 needs: clang-format-lib steps: - uses: actions/checkout@v2 @@ -21,14 +21,14 @@ jobs: docker build . -f Dockerfile.buildlocal -t builder docker run --rm -v ${PWD}:/project builder make clang-format-examples: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: clang-format run: | docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src build-examples: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 needs: clang-format-examples steps: - uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 5a1dfd2..65e0282 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM wiiuenv/devkitppc:20220724 +FROM wiiuenv/devkitppc:20220806 WORKDIR tmp_build COPY . . diff --git a/Dockerfile.buildexamples b/Dockerfile.buildexamples index 4b7917d..13ad101 100644 --- a/Dockerfile.buildexamples +++ b/Dockerfile.buildexamples @@ -1,4 +1,4 @@ -FROM wiiuenv/devkitppc:20220724 +FROM wiiuenv/devkitppc:20220806 WORKDIR tmp_build COPY . . @@ -8,7 +8,7 @@ WORKDIR /artifacts FROM scratch as libwups COPY --from=0 /artifacts /artifacts -FROM wiiuenv/devkitppc:20220724 +FROM wiiuenv/devkitppc:20220806 COPY --from=libwups /artifacts $DEVKITPRO diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal index fc3a192..08fc052 100644 --- a/Dockerfile.buildlocal +++ b/Dockerfile.buildlocal @@ -1,3 +1,3 @@ -FROM wiiuenv/devkitppc:20220724 +FROM wiiuenv/devkitppc:20220806 WORKDIR project \ No newline at end of file