diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 2594484..28aa855 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -6,11 +6,6 @@ author: ok-nick inputs: version: required: false - trust-check: - default: 'true' - required: false - trusts: - required: false path: default: '.' required: false @@ -34,8 +29,6 @@ runs: uses: ./ with: version: ${{ inputs.version }} - trust-check: ${{ inputs.trust-check }} - trusts: ${{ inputs.trusts }} path: ${{ inputs.path }} token: ${{ inputs.token }} diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a91924b..d3b48aa 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -13,59 +13,23 @@ defaults: shell: bash jobs: - test_linux_no_trust: + test_linux: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/test - with: - trust-check: false - test_mac_no_trust: + test_mac: runs-on: macos-latest steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/test - with: - trust-check: false - test_windows_no_trust: + test_windows: runs-on: windows-latest steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/test - with: - trust-check: false - - test_linux_with_trust: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/test - with: - trusts: "Kampfkarren/selene JohnnyMorganz/stylua rojo-rbx/rojo" - - test_mac_with_trust: - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/test - with: - trusts: "Kampfkarren/selene JohnnyMorganz/stylua rojo-rbx/rojo" - - test_windows_with_trust: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/test - with: - trusts: "Kampfkarren/selene JohnnyMorganz/stylua rojo-rbx/rojo" test_linux_version_and_path: runs-on: ubuntu-latest @@ -76,7 +40,6 @@ jobs: - uses: ./.github/actions/test with: version: v0.2.6 - trust-check: false path: "./project" test_mac_version_and_path: @@ -88,7 +51,6 @@ jobs: - uses: ./.github/actions/test with: version: v0.2.6 - trust-check: false path: "./project" test_windows_version_and_path: @@ -100,5 +62,4 @@ jobs: - uses: ./.github/actions/test with: version: v0.2.6 - trust-check: false path: "./project" diff --git a/README.md b/README.md index 89546fd..2415f6b 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,6 @@ steps: |name|description|default| |---|---|---| |`version`|`aftman` version in the form `vx.x.x`|-| -|`trust-check`|Whether to check trusts|`true`| -|`trusts`|List of trusted tools separated by spaces|-| |`path`|Path to the `aftman.toml` directory|`.`| |`token`|Github token from `github.token`|`github.token`| diff --git a/action.yml b/action.yml index ff070b3..4a037d7 100644 --- a/action.yml +++ b/action.yml @@ -6,13 +6,6 @@ inputs: version: description: '`aftman` version in the form `vx.x.x`' required: false - trust-check: - description: "Whether to check trusts" - default: 'true' - required: false - trusts: - description: 'List of trusted tools separated by spaces' - required: false path: description: 'Path to the `aftman.toml` directory' default: '.' @@ -53,22 +46,10 @@ runs: echo "$HOME/.aftman/bin" >> $GITHUB_PATH shell: bash - - name: Setup trusts - if: inputs.trust-check == 'true' - run: | - for name in ${{ inputs.trusts }}; do - aftman trust $name - done - shell: bash - - name: Install tools run: | cd ${{ inputs.path }} - if [ ${{ inputs.trust-check }} == false ]; then - aftman install --no-trust-check - else - aftman install - fi + aftman install --no-trust-check shell: bash branding: