From f37e08b4be4890bf3d9607bcdf09e953b83cc534 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Tue, 7 Jun 2022 10:46:45 +0200 Subject: [PATCH] ci: deprecated self-hosted agents for SDL2 builds, using Docker instead --- .github/workflows/c-cpp.yml | 343 +++++------------------------------- 1 file changed, 45 insertions(+), 298 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 0c7a30dbc..85cbdc7c9 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -60,7 +60,7 @@ jobs: artifacts: | amiberry-${{ steps.tag.outputs.tag }}-rpi3-dmx-32bit-rpios.zip - build-rpi3-sdl2-32bit-docker: + build-rpi3-sdl2-32bit-debian: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -76,7 +76,7 @@ jobs: make -j8 PLATFORM=rpi3-sdl2 - uses: actions/upload-artifact@v3 with: - name: amiberry-rpi3-sdl2-32bit-docker + name: amiberry-rpi3-sdl2-32bit-debian path: | amiberry capsimg.so @@ -97,7 +97,7 @@ jobs: strip_v: false - name: ZIP binaries if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-32bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot + run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-32bit-debian.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - name: Create Changelog if: github.ref_type == 'tag' id: changelog @@ -113,58 +113,7 @@ jobs: omitBodyDuringUpdate: true body: ${{ steps.changelog.outputs.changes }} artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-32bit-rpios.zip - - # build-rpi3-sdl2-32bit-rpios: - # runs-on: [self-hosted, Linux, ARM, rpios32] - # steps: - # - uses: actions/checkout@v3 - # with: - # submodules: 'true' - # - name: make capsimg - # run: make capsimg - # - name: make for RPIOS RPI3-SDL2 32-bit - # run: make -j4 PLATFORM=rpi3-sdl2 - # - uses: actions/upload-artifact@v3 - # with: - # name: amiberry-rpi3-sdl2-32bit-rpios - # path: | - # amiberry - # capsimg.so - # abr/** - # conf/** - # controllers/** - # data/** - # kickstarts/** - # savestates/** - # screenshots/** - # whdboot/** - # - name: Get tag - # if: github.ref_type == 'tag' - # id: tag - # uses: dawidd6/action-get-tag@v1 - # with: - # # Optionally strip `v` prefix - # strip_v: false - # - name: ZIP binaries - # if: github.ref_type == 'tag' - # run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-32bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - # - name: Create Changelog - # if: github.ref_type == 'tag' - # id: changelog - # uses: loopwerk/tag-changelog@v1 - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - # config_file: .github/tag-changelog-config.js - # - name: Create Release - # if: github.ref_type == 'tag' - # uses: ncipollo/release-action@v1 - # with: - # allowUpdates: true - # omitBodyDuringUpdate: true - # body: ${{ steps.changelog.outputs.changes }} - # artifacts: | - # amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-32bit-rpios.zip + amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-32bit-debian.zip build-rpi4-dmx-32bit-rpios: runs-on: [self-hosted, Linux, ARM, rpios32, dmx] @@ -219,7 +168,7 @@ jobs: artifacts: | amiberry-${{ steps.tag.outputs.tag }}-rpi4-dmx-32bit-rpios.zip - build-rpi4-sdl2-32bit-docker: + build-rpi4-sdl2-32bit-debian: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -235,7 +184,7 @@ jobs: make -j8 PLATFORM=rpi4-sdl2 - uses: actions/upload-artifact@v3 with: - name: amiberry-rpi4-sdl2-32bit-docker + name: amiberry-rpi4-sdl2-32bit-debian path: | amiberry capsimg.so @@ -256,7 +205,7 @@ jobs: strip_v: false - name: ZIP binaries if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-32bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot + run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-32bit-debian.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - name: Create Changelog if: github.ref_type == 'tag' id: changelog @@ -272,125 +221,25 @@ jobs: omitBodyDuringUpdate: true body: ${{ steps.changelog.outputs.changes }} artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-32bit-rpios.zip - - # build-rpi4-sdl2-32bit-rpios: - # runs-on: [self-hosted, Linux, ARM, rpios32] - # steps: - # - uses: actions/checkout@v3 - # with: - # submodules: 'true' - # - name: make capsimg - # run: make capsimg - # - name: make for RPIOS RPI4-SDL2 32-bit - # run: make -j4 PLATFORM=rpi4-sdl2 - # - name: copy binary locally - # run: cp amiberry ~/projects/amiberry/amiberry - # - uses: actions/upload-artifact@v3 - # with: - # name: amiberry-rpi4-sdl2-32bit-rpios - # path: | - # amiberry - # capsimg.so - # abr/** - # conf/** - # controllers/** - # data/** - # kickstarts/** - # savestates/** - # screenshots/** - # whdboot/** - # - name: Get tag - # if: github.ref_type == 'tag' - # id: tag - # uses: dawidd6/action-get-tag@v1 - # with: - # # Optionally strip `v` prefix - # strip_v: false - # - name: ZIP binaries - # if: github.ref_type == 'tag' - # run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-32bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - # - name: Create Changelog - # if: github.ref_type == 'tag' - # id: changelog - # uses: loopwerk/tag-changelog@v1 - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - # config_file: .github/tag-changelog-config.js - # - name: Create Release - # if: github.ref_type == 'tag' - # uses: ncipollo/release-action@v1 - # with: - # allowUpdates: true - # omitBodyDuringUpdate: true - # body: ${{ steps.changelog.outputs.changes }} - # artifacts: | - # amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-32bit-rpios.zip + amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-32bit-debian.zip - build-rpi3-dmx-64bit-rpios: - runs-on: [self-hosted, Linux, ARM64, rpios64, dmx] + build-rpi3-sdl2-64bit-debian: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: submodules: 'true' - - name: make capsimg - run: make capsimg - - name: make for RPIOS RPI3-DMX 64-bit - run: make -j4 PLATFORM=rpi3-64-dmx - - uses: actions/upload-artifact@v3 - with: - name: amiberry-rpi3-dmx-64bit-rpios - path: | - amiberry - capsimg.so - abr/** - conf/** - controllers/** - data/** - kickstarts/** - savestates/** - screenshots/** - whdboot/** - - name: Get tag - if: github.ref_type == 'tag' - id: tag - uses: dawidd6/action-get-tag@v1 - with: - # Optionally strip `v` prefix - strip_v: false - - name: ZIP binaries - if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi3-dmx-64bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - - name: Create Changelog - if: github.ref_type == 'tag' - id: changelog - uses: loopwerk/tag-changelog@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - config_file: .github/tag-changelog-config.js - - name: Create Release - if: github.ref_type == 'tag' - uses: ncipollo/release-action@v1 - with: - allowUpdates: true - omitBodyDuringUpdate: true - body: ${{ steps.changelog.outputs.changes }} - artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi3-dmx-64bit-rpios.zip - - build-rpi3-sdl2-64bit-rpios: - runs-on: [self-hosted, Linux, ARM64, rpios64] - steps: - - uses: actions/checkout@v3 + - name: Run the build process with Docker + uses: addnab/docker-run-action@v3 with: - submodules: 'true' - - name: make capsimg - run: make capsimg - - name: make for RPIOS RPI3-SDL2 64-bit - run: make -j4 PLATFORM=rpi3-64-sdl2 + image: midwan/amiberry-docker-aarch64:latest + options: -v ${{ github.workspace }}:/build + run: | + make capsimg + make -j8 PLATFORM=rpi3-64-sdl2 - uses: actions/upload-artifact@v3 with: - name: amiberry-rpi3-sdl2-64bit-rpios + name: amiberry-rpi3-sdl2-64bit-debian path: | amiberry capsimg.so @@ -411,7 +260,7 @@ jobs: strip_v: false - name: ZIP binaries if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-64bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot + run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-64bit-debian.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - name: Create Changelog if: github.ref_type == 'tag' id: changelog @@ -427,76 +276,25 @@ jobs: omitBodyDuringUpdate: true body: ${{ steps.changelog.outputs.changes }} artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-64bit-rpios.zip + amiberry-${{ steps.tag.outputs.tag }}-rpi3-sdl2-64bit-debian.zip - build-rpi4-dmx-64bit-rpios: - runs-on: [self-hosted, Linux, ARM64, rpios64, dmx] + build-rpi4-sdl2-64bit-debian: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: submodules: 'true' - - name: make capsimg - run: make capsimg - - name: make for RPIOS RPI4-DMX 64-bit - run: make -j4 PLATFORM=rpi4-64-dmx - - name: copy binary locally - run: cp amiberry ~/projects/amiberry/amiberry-dmx - - uses: actions/upload-artifact@v3 - with: - name: amiberry-rpi4-dmx-64bit-rpios - path: | - amiberry - capsimg.so - abr/** - conf/** - controllers/** - data/** - kickstarts/** - savestates/** - screenshots/** - whdboot/** - - name: Get tag - if: github.ref_type == 'tag' - id: tag - uses: dawidd6/action-get-tag@v1 - with: - # Optionally strip `v` prefix - strip_v: false - - name: ZIP binaries - if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-dmx-64bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - - name: Create Changelog - if: github.ref_type == 'tag' - id: changelog - uses: loopwerk/tag-changelog@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - config_file: .github/tag-changelog-config.js - - name: Create Release - if: github.ref_type == 'tag' - uses: ncipollo/release-action@v1 - with: - allowUpdates: true - omitBodyDuringUpdate: true - body: ${{ steps.changelog.outputs.changes }} - artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi4-dmx-64bit-rpios.zip - - build-rpi4-sdl2-64bit-rpios: - runs-on: [self-hosted, Linux, ARM64, rpios64] - steps: - - uses: actions/checkout@v3 + - name: Run the build process with Docker + uses: addnab/docker-run-action@v3 with: - submodules: 'true' - - name: make capsimg - run: make capsimg - - name: make for RPIOS RPI4-SDL2 64-bit - run: make -j4 PLATFORM=rpi4-64-sdl2 - - name: copy binary locally - run: cp amiberry ~/projects/amiberry/amiberry + image: midwan/amiberry-docker-aarch64:latest + options: -v ${{ github.workspace }}:/build + run: | + make capsimg + make -j8 PLATFORM=rpi4-64-sdl2 - uses: actions/upload-artifact@v3 with: - name: amiberry-rpi4-sdl2-64bit-rpios + name: amiberry-rpi4-sdl2-64bit-debian path: | amiberry capsimg.so @@ -517,7 +315,7 @@ jobs: strip_v: false - name: ZIP binaries if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-64bit-rpios.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot + run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-64bit-debian.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - name: Create Changelog if: github.ref_type == 'tag' id: changelog @@ -533,76 +331,25 @@ jobs: omitBodyDuringUpdate: true body: ${{ steps.changelog.outputs.changes }} artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-64bit-rpios.zip - - build-rpi4-sdl2-64bit-manjaro: - runs-on: [self-hosted, Linux, ARM64, manjaro] + amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-64bit-debian.zip + + build-RK3399-sdl2-64bit-debian: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: submodules: 'true' - - name: make capsimg - run: make capsimg - - name: make for Manjaro RPI4-SDL2 64-bit - run: make -j4 PLATFORM=rpi4-64-sdl2 - - name: copy binary locally - run: cp amiberry ~/projects/amiberry/amiberry - - uses: actions/upload-artifact@v3 - with: - name: amiberry-rpi4-sdl2-64bit-manjaro - path: | - amiberry - capsimg.so - abr/** - conf/** - controllers/** - data/** - kickstarts/** - savestates/** - screenshots/** - whdboot/** - - name: Get tag - if: github.ref_type == 'tag' - id: tag - uses: dawidd6/action-get-tag@v1 - with: - # Optionally strip `v` prefix - strip_v: false - - name: ZIP binaries - if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-64bit-manjaro.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - - name: Create Changelog - if: github.ref_type == 'tag' - id: changelog - uses: loopwerk/tag-changelog@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - config_file: .github/tag-changelog-config.js - - name: Create Release - if: github.ref_type == 'tag' - uses: ncipollo/release-action@v1 - with: - allowUpdates: true - omitBodyDuringUpdate: true - body: ${{ steps.changelog.outputs.changes }} - artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rpi4-sdl2-64bit-manjaro.zip - - build-RK3399-sdl2-64bit-manjaro: - runs-on: [self-hosted, Linux, ARM64, rockpro64] - steps: - - uses: actions/checkout@v3 + - name: Run the build process with Docker + uses: addnab/docker-run-action@v3 with: - submodules: 'true' - - name: make capsimg - run: make capsimg - - name: make for RK3399 - run: make -j4 PLATFORM=n2 - - name: copy binary locally - run: cp amiberry ~/projects/amiberry/amiberry + image: midwan/amiberry-docker-aarch64:latest + options: -v ${{ github.workspace }}:/build + run: | + make capsimg + make -j8 PLATFORM=n2 - uses: actions/upload-artifact@v3 with: - name: amiberry-rk3399-sdl2-64bit-manjaro + name: amiberry-rk3399-sdl2-64bit-debian path: | amiberry capsimg.so @@ -623,7 +370,7 @@ jobs: strip_v: false - name: ZIP binaries if: github.ref_type == 'tag' - run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rk3399-sdl2-64bit-manjaro.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot + run: zip -r amiberry-${{ steps.tag.outputs.tag }}-rk3399-sdl2-64bit-debian.zip amiberry capsimg.so abr conf controllers data kickstarts savestates screenshots whdboot - name: Create Changelog if: github.ref_type == 'tag' id: changelog @@ -639,7 +386,7 @@ jobs: omitBodyDuringUpdate: true body: ${{ steps.changelog.outputs.changes }} artifacts: | - amiberry-${{ steps.tag.outputs.tag }}-rk3399-sdl2-64bit-manjaro.zip + amiberry-${{ steps.tag.outputs.tag }}-rk3399-sdl2-64bit-debian.zip build-macOS-64bit-intel: runs-on: [self-hosted, macOS, X64]