From 898f0780bcbd96683e5ac3c8d1b671237e4894df Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Fri, 30 Jun 2023 02:32:40 +0200 Subject: [PATCH] just use ubuntu for inkscape --- .github/workflows/build.yml | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68e5227f..228cd48a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,11 +125,8 @@ jobs: upload: needs: [build, compare] - runs-on: windows-latest + runs-on: ubuntu-latest if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - INKSCAPE_DIR: inkscape-1.2.2_2022-12-09_732a01da63-x64 steps: - uses: actions/checkout@v3 with: @@ -140,36 +137,18 @@ jobs: name: Win32 path: build - - uses: actions/download-artifact@master + - uses: awalsh128/cache-apt-pkgs-action@latest with: - name: Accuracy Report - - - name: Restore Inkscpae - id: cache-inkscape - uses: actions/cache/restore@v3 - with: - path: ${{ env.INKSCAPE_DIR }} - key: ${{ env.INKSCAPE_DIR }} - - - name: Download Inkscape - if: ${{ !steps.cache-inkscape.outputs.cache-hit }} - run: | - curl -fLOSs https://inkscape.org/gallery/item/37364/$env:INKSCAPE_DIR.7z - 7z x $env:INKSCAPE_DIR.7z - - - name: Cache Inkscape - if: ${{ !steps.cache-inkscape.outputs.cache-hit }} - uses: actions/cache/save@v3 - with: - path: ${{ env.INKSCAPE_DIR }} - key: ${{ env.INKSCAPE_DIR }} + packages: inkscape + version: 1.0 - name: Upload Continuous Release - shell: bash + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | # Convert SVGs to PNG - $env:INKSCAPE_DIR/bin/inkscape -w 512 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG - $env:INKSCAPE_DIR/bin/inkscape -w 512 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG + inkscape -w 512 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG + inkscape -w 512 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG ./upload.sh \ build/ISLE.EXE \