From 6384d567e61a17e7f3857be4e51a9de70f8e2c91 Mon Sep 17 00:00:00 2001 From: ok-nick <25470747+ok-nick@users.noreply.github.com> Date: Mon, 18 Jul 2022 12:20:56 -0400 Subject: [PATCH] fix defaults --- .github/actions/test/action.yml | 8 ++------ .github/workflows/CI.yml | 4 ++++ action.yml | 10 ++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 1314e9b..b3b0e17 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -18,21 +18,17 @@ inputs: default: '${{ github.token }}' required: false -defaults: - run: - shell: bash - runs: using: 'composite' steps: - - shell: bash - run: | + - run: | cat > ${{ inputs.path}}/aftman.toml << EOF [tools] selene = "Kampfkarren/selene@0.19.1" stylua = "JohnnyMorganz/stylua@0.14.0" rojo = "rojo-rbx/rojo@7.2.1" EOF + shell: bash - name: Run setup-aftman uses: ./ diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a5ec9bc..20c649b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,6 +1,10 @@ name: CI on: [push, pull_request] +defaults: + run: + shell: bash + jobs: test_linux_no_trust: runs-on: ubuntu-latest diff --git a/action.yml b/action.yml index 3c021ec..2a8e001 100644 --- a/action.yml +++ b/action.yml @@ -22,28 +22,27 @@ inputs: default: '${{ github.token }}' required: false -defaults: - run: - shell: bash - runs: using: 'composite' steps: - name: Download aftman if: runner.os == 'Linux' run: gh release download ${{ inputs.version }} --repo LPGhatguy/aftman --pattern *linux-x86_64.zip + shell: bash env: GITHUB_TOKEN: ${{ inputs.token }} - name: Download aftman if: runner.os == 'macOS' run: gh release download ${{ inputs.version }} --repo LPGhatguy/aftman --pattern *macos-x86_64.zip + shell: bash env: GITHUB_TOKEN: ${{ inputs.token }} - name: Download aftman if: runner.os == 'Windows' run: gh release download ${{ inputs.version }} --repo LPGhatguy/aftman --pattern *windows-x86_64.zip + shell: bash env: GITHUB_TOKEN: ${{ inputs.token }} @@ -52,6 +51,7 @@ runs: unzip aftman*.zip ./aftman self-install echo "$HOME/.aftman/bin" >> $GITHUB_PATH + shell: bash - name: Setup trusts if: ${{ inputs.no-trust-check == false }} @@ -59,6 +59,7 @@ runs: for name in ${{ inputs.trusts }}; do aftman trust $name done + shell: bash - name: Install tools run: | @@ -68,6 +69,7 @@ runs: else aftman install fi + shell: bash branding: icon: link-2