From 5df376521ea59a4d1c37a69ba5c9ed6b8f254a88 Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Tue, 13 Feb 2024 21:43:49 -0300 Subject: [PATCH] ok just revert all of configs changes i cant be bothered --- combine/action.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/combine/action.yml b/combine/action.yml index 9d70062..ed6c2fd 100644 --- a/combine/action.yml +++ b/combine/action.yml @@ -20,31 +20,30 @@ runs: using: composite steps: - name: Download CLI - uses: robinraju/release-downloader@v1.9 + uses: robinraju/release-downloader@v1.8 with: repository: geode-sdk/cli latest: ${{ inputs.cli == 'latest' }} tag: ${{ inputs.cli != 'latest' && inputs.cli || '' }} - fileName: "*-linux.zip" tarBall: false zipBall: false - out-file-path: "cli" + fileName: "*-linux.zip" + extract: true + out-file-path: ${{ github.action_path }} - - name: Setup CLI + - run: echo "${{ github.action_path }}" >> $GITHUB_PATH shell: bash - run: | - 7z x "cli/*-linux.zip" -ocli - echo "${{ github.workspace }}/cli" >> $GITHUB_PATH - chmod +x "cli/geode" - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: - path: artifacts - + path: "${{ github.action_path }}/artifacts" + - name: Combine them shell: bash id: merge run: | + cd "${{ github.action_path }}" + chmod +x ./geode mkdir out MODS=$(find . -name *.geode -type f -printf "%f\n" | sort -u) for mod in $MODS; do @@ -69,14 +68,14 @@ runs: fi cp $FIRST out done - echo "output=${{ github.workspace }}/out" >> $GITHUB_OUTPUT + echo "output=${{ github.action_path }}/out" >> $GITHUB_OUTPUT - uses: geekyeggo/delete-artifact@v2 if: ${{ inputs.delete-artifacts }} with: name: geode-build-win failOnError: false - + - uses: geekyeggo/delete-artifact@v2 if: ${{ inputs.delete-artifacts }} with: