From ea931c0e53df5a8138addce637ce1add195cdd89 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Thu, 15 Jun 2023 21:33:09 +0300 Subject: [PATCH] Use concurrency in CI, update some actions, copy pixelorama_data folder in the RPI4 builds --- .github/workflows/dev-desktop-builds.yml | 24 +++++++++++++++--------- .github/workflows/dev-web.yml | 8 ++++++-- .github/workflows/release.yml | 18 ++++++++---------- .github/workflows/static-checks.yml | 4 ++++ 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.github/workflows/dev-desktop-builds.yml b/.github/workflows/dev-desktop-builds.yml index eed2dccc6..c033d8600 100644 --- a/.github/workflows/dev-desktop-builds.yml +++ b/.github/workflows/dev-desktop-builds.yml @@ -1,4 +1,4 @@ -name: "dev-desktop-builds" +name: Development desktop builds on: push: @@ -10,6 +10,11 @@ on: - "installer/*.pot" - "installer/po/*" + +concurrency: + group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-devdesktop + cancel-in-progress: true + env: GODOT_VERSION: 3.5.2 GODOT_VERSION_MAC: 3.5.2 @@ -34,7 +39,7 @@ jobs: echo 'export/windows/wine = "/usr/bin/wine"' >> ~/.config/godot/editor_settings-3.tres echo 'export/windows/rcedit = "/github/home/.local/share/rcedit/rcedit-x64.exe"' >> ~/.config/godot/editor_settings-3.tres - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup 💻 @@ -48,7 +53,7 @@ jobs: cp -R ./pixelorama_data ./build/windows-64bit rm ./build/windows-64bit/pixelorama_data/.gdignore - name: Upload Artifact 🚀 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Windows-64bit path: ./build/windows-64bit/ @@ -61,7 +66,7 @@ jobs: image: docker://barichello/godot-ci:3.5.2 steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup 💻 @@ -82,21 +87,22 @@ jobs: chmod +x ./build/linux-rpi4/$EXPORT_NAME.rpi4 - name: Copy pixelorama_data folder 📁 run: | + rm ./pixelorama_data/.gdignore cp -R ./pixelorama_data ./build/linux-64bit - rm ./build/linux-64bit/pixelorama_data/.gdignore + cp -R ./pixelorama_data ./build/linux-rpi4 - name: Create tar.gz archive 🗜️ run: | cd build tar zcvf linux-64bit.tar.gz linux-64bit tar zcvf linux-rpi4.tar.gz linux-rpi4 - name: Upload Artifact 🚀 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Linux-64bit path: ./build/linux-64bit.tar.gz retention-days: 14 - name: Upload Raspberry Pi 4 Artifact 🚀 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Linux-rpi4 path: ./build/linux-rpi4.tar.gz @@ -107,7 +113,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup environment 🔧 @@ -147,7 +153,7 @@ jobs: - name: Create DMG archive 🔧 run: hdiutil create -srcfolder ./build/mac -fs HFS+ -volname Pixelorama ./build/mac/Pixelorama.dmg - name: Upload Artifact 🚀 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Mac path: ./build/mac/Pixelorama.dmg diff --git a/.github/workflows/dev-web.yml b/.github/workflows/dev-web.yml index a8c659406..5240803eb 100644 --- a/.github/workflows/dev-web.yml +++ b/.github/workflows/dev-web.yml @@ -1,9 +1,13 @@ -name: "dev-web" +name: Development Web build on: push: branches: [ master ] +concurrency: + group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-devweb + cancel-in-progress: true + env: GODOT_VERSION: 3.5.2 EXPORT_NAME: Pixelorama @@ -16,7 +20,7 @@ jobs: image: docker://barichello/godot-ci:3.5.2 steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup 💻 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a6107563..91bd53e13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: "release" +name: Stable release builds on: push: @@ -30,7 +30,7 @@ jobs: echo 'export/windows/wine = "/usr/bin/wine"' >> ~/.config/godot/editor_settings-3.tres echo 'export/windows/rcedit = "/github/home/.local/share/rcedit/rcedit-x64.exe"' >> ~/.config/godot/editor_settings-3.tres - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup 💻 @@ -43,12 +43,10 @@ jobs: godot -v --export "Windows Desktop 32-bit" ./build/windows-32bit/$EXPORT_NAME.exe - name: Copy pixelorama_data folder 📁 run: | + rm ./pixelorama_data/.gdignore cp -R ./pixelorama_data ./build/windows-64bit - rm ./build/windows-64bit/pixelorama_data/.gdignore cp -R ./pixelorama_data ./build/windows-32bit - rm ./build/windows-32bit/pixelorama_data/.gdignore cp -R ./pixelorama_data ./build - rm ./build/pixelorama_data/.gdignore - name: Zip 🗜️ working-directory: ./build run: | @@ -81,7 +79,7 @@ jobs: image: docker://barichello/godot-ci:3.5.2 steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup 💻 @@ -104,10 +102,10 @@ jobs: chmod +x ./build/linux-rpi4/$EXPORT_NAME.rpi4 - name: Copy pixelorama_data folder 📁 run: | + rm ./pixelorama_data/.gdignore cp -R ./pixelorama_data ./build/linux-64bit - rm ./build/linux-64bit/pixelorama_data/.gdignore cp -R ./pixelorama_data ./build/linux-32bit - rm ./build/linux-32bit/pixelorama_data/.gdignore + cp -R ./pixelorama_data ./build/linux-rpi4 - name: Create tar.gz archive 🗜️ run: | cd build @@ -133,7 +131,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup environment 🔧 @@ -194,7 +192,7 @@ jobs: image: docker://barichello/godot-ci:3.5.2 steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Setup 💻 diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index 30608894f..2b0bde8da 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -9,6 +9,10 @@ on: - "addons/**" - "src/**" +concurrency: + group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-static + cancel-in-progress: true + jobs: static-checks: runs-on: ubuntu-latest