From fb7171f704214919455349719347d6585973231e Mon Sep 17 00:00:00 2001 From: astrid Date: Thu, 16 Jan 2025 15:09:37 +0100 Subject: [PATCH] going to cry --- .github/workflows/build_overlay.yml | 6 ++--- .github/workflows/update_importedguns.yml | 30 ++++++++++++++++++++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_overlay.yml b/.github/workflows/build_overlay.yml index 9ab4364..786e5ef 100644 --- a/.github/workflows/build_overlay.yml +++ b/.github/workflows/build_overlay.yml @@ -101,7 +101,7 @@ jobs: run: pnpm install - name: Install dependencies (ubuntu) - if: matrix.platform == "ubuntu-22.04" # This must match the platform value defined above. + if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above. run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf @@ -139,8 +139,8 @@ jobs: - name: Convert artifact paths id: artifact_paths run: | - json="${{ steps.tauri_build.outputs.artifactPaths }}" # must use single quotes - list="$(echo $json | jq -r ". | join(", ")")" + json='${{ steps.tauri_build.outputs.artifactPaths }}' # must use single quotes + list="$(echo $json | jq -r '. | join(", ")')" echo "list=$list" >> $GITHUB_OUTPUT - uses: actions/attest-build-provenance@v1 diff --git a/.github/workflows/update_importedguns.yml b/.github/workflows/update_importedguns.yml index f1e8274..92dd946 100644 --- a/.github/workflows/update_importedguns.yml +++ b/.github/workflows/update_importedguns.yml @@ -9,10 +9,26 @@ jobs: update-importedguns: runs-on: ubuntu-latest + defaults: + run: + shell: bash + working-directory: ./packages/mtc-artillery + steps: - name: Checkout code uses: actions/checkout@v4 + - uses: pnpm/action-setup@v4.0.0 + with: + version: 9 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + cache: "pnpm" + cache-dependency-path: ./packages/mtc-artillery/pnpm-lock.yaml + - name: Execute script id: roblox-luau-execution uses: grand-hawk/action-roblox-luau-execution@1.0.0 @@ -20,13 +36,19 @@ jobs: roblox_api_key: ${{ secrets.ROBLOX_LUAU_EXECUTION_API_KEY }} universe_id: "3221676855" place_id: "8421780146" - luau_file: "packages/mtc-artillery/scripts/exportProjectiles.luau" - output_file: "${{ runner.temp }}/output.json" + luau_file: "./packages/mtc-artillery/scripts/exportProjectiles.luau" + output_file: "script-execution-output.json" - name: Process JSON output - run: jq ".[0]" "${{ runner.temp }}/output.json" > "packages/mtc-artillery/src/config/importedGuns.json" + run: jq ".[0]" "script-execution-output.json" > "./src/config/importedGuns.json" + + - name: Install pnpm packages + run: pnpm install + + - name: Format + run: pnpm run format - name: Commit changes uses: EndBug/add-and-commit@v9 with: - add: "packages/mtc-artillery/src/config/importedGuns.json" + add: "./src/config/importedGuns.json"