diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e7052a6f6..f8a50f083 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -21,7 +21,7 @@ jobs: name: ${{ matrix.platform.name }} (${{ matrix.configuration }}) runs-on: docker container: - image: ghcr.io/catthehacker/ubuntu:act-latest + image: ghcr.io/gruke-build/ubuntu:dotnet-latest timeout-minutes: 45 strategy: matrix: @@ -37,19 +37,6 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: actions/setup-dotnet@v5 - with: - global-json-file: global.json - - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - - - name: Install 7zip - run: | - sudo apt update && sudo apt install -y 7zip - - name: Overwrite csc problem matcher run: echo "::add-matcher::.forgejo/csc.json" @@ -107,14 +94,6 @@ jobs: PLATFORM_NAME="${{ matrix.platform.name }}" - sudo apt update && sudo apt install -y zsync desktop-file-utils appstream libfuse2t64 - - mkdir -p tools - export PATH="$PATH:$(readlink -f tools)" - - # Setup appimagetool - wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" - chmod +x tools/appimagetool chmod +x distribution/linux/appimage/build-appimage.sh # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) @@ -141,7 +120,9 @@ jobs: build_macos: name: macOS Universal (${{ matrix.configuration }}) - runs-on: ubuntu-latest + runs-on: docker + container: + image: ghcr.io/gruke-build/ubuntu:dotnet-latest timeout-minutes: 45 strategy: matrix: @@ -150,21 +131,12 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: actions/setup-dotnet@v5 - with: - global-json-file: global.json - - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh 17 - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - - name: Install rcodesign run: | gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz diff --git a/.forgejo/workflows/canary.yml b/.forgejo/workflows/canary.yml index 930e6b253..98c7cf06d 100644 --- a/.forgejo/workflows/canary.yml +++ b/.forgejo/workflows/canary.yml @@ -31,29 +31,16 @@ jobs: strategy: matrix: platform: - - { name: win-x64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_x64 } - #- { name: win-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_arm64 } - - { name: linux-x64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_x64 } - - { name: linux-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_arm64 } + - { name: win-x64, os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: win_x64 } + #- { name: win-arm64, os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: win_arm64 } + - { name: linux-x64, os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: linux_x64 } + - { name: linux-arm64, os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: linux_arm64 } steps: - uses: actions/checkout@v6 - - uses: actions/setup-dotnet@v5 - with: - global-json-file: global.json - - name: Overwrite csc problem matcher run: echo "::add-matcher::.forgejo/csc.json" - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - - - name: Install 7zip - run: | - sudo apt update && sudo apt install -y 7zip - - name: Get version info id: version_info run: | @@ -105,14 +92,6 @@ jobs: BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" PLATFORM_NAME="${{ matrix.platform.name }}" - sudo apt update && sudo apt install -y zsync desktop-file-utils appstream libfuse2t64 - - mkdir -p tools - export PATH="$PATH:$(readlink -f tools)" - - # Setup appimagetool - wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" - chmod +x tools/appimagetool chmod +x distribution/linux/appimage/build-appimage.sh # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) @@ -149,24 +128,15 @@ jobs: name: Release MacOS universal runs-on: docker container: - image: ghcr.io/catthehacker/ubuntu:act-latest + image: ghcr.io/gruke-build/ubuntu:dotnet-latest steps: - uses: actions/checkout@v6 - - uses: actions/setup-dotnet@v5 - with: - global-json-file: global.json - - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh 17 - - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - name: Install rcodesign run: | @@ -212,18 +182,11 @@ jobs: name: Post CI Steps runs-on: docker container: - image: ghcr.io/catthehacker/ubuntu:act-latest + image: ghcr.io/gruke-build/ubuntu:act-latest needs: - macos_release - release steps: - - uses: actions/checkout@v6 - - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - - name: Get version info id: version_info run: | diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 341430adb..712be83cd 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -25,28 +25,15 @@ jobs: strategy: matrix: platform: - - { name: win-x64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_x64 } - #- { name: win-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_arm64 } - - { name: linux-x64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_x64 } - - { name: linux-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: linux_arm64 } + - { name: win-x64, os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: win_x64 } + #- { name: win-arm64, os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: win_arm64 } + - { name: linux-x64, os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: linux_x64 } + - { name: linux-arm64, os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: linux_arm64 } steps: - uses: actions/checkout@v6 - - uses: actions/setup-dotnet@v5 - with: - global-json-file: global.json - - name: Overwrite csc problem matcher run: echo "::add-matcher::.github/csc.json" - - - name: Install 7zip - run: | - sudo apt install -y 7zip - - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - name: Get version info id: version_info @@ -102,14 +89,6 @@ jobs: BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" PLATFORM_NAME="${{ matrix.platform.name }}" - sudo apt install -y zsync desktop-file-utils appstream - - mkdir -p tools - export PATH="$PATH:$(readlink -f tools)" - - # Setup appimagetool - wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" - chmod +x tools/appimagetool chmod +x distribution/linux/appimage/build-appimage.sh # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) @@ -143,7 +122,9 @@ jobs: macos_release: name: Release MacOS universal - runs-on: ubuntu-latest + runs-on: docker + container: + image: ghcr.io/gruke-build/ubuntu:dotnet-latest steps: - uses: actions/checkout@v6 @@ -156,11 +137,6 @@ jobs: wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh 17 - - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - name: Install rcodesign run: | @@ -205,18 +181,13 @@ jobs: post_ci: name: Post-CI Steps - runs-on: ubuntu-latest + runs-on: docker + container: + image: ghcr.io/gruke-build/ubuntu:act-latest needs: - macos_release - release steps: - - uses: actions/checkout@v6 - - - name: Install GLI - uses: actions/setup-gli@v1 - with: - token: ${{ secrets.SETUP_GLI_TOKEN }} - - name: Get version info id: version_info run: |