feat: use scoop-setup

guitarrapc · May 29, 2023 · a09ce47 · a09ce47
1 parent a421901
commit a09ce47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Modules
         shell: pwsh
         run: |
@@ -26,14 +26,9 @@ jobs:
         run: |
           Invoke-ScriptAnalyzer -Path ./src -Settings ./PSScriptAnalyzerSettings.psd1 -Severity Warning
           Invoke-ScriptAnalyzer -Path ./src/ScoopPlaybook.psm1 -Settings CodeFormatting
-      # Actions shell is Administartor. see https://github.com/ScoopInstaller/Install#for-admin
-      # Need install scoop in same run of Invoke-Pester.
-      - name: Run Unit Test
-        shell: pwsh
+      - uses: MinoruSekine/setup-scoop@main # use @main to fix. see https://github.com/MinoruSekine/setup-scoop/issues/7
+      - name: Test Scoop installed
         run: |
-          iwr -useb get.scoop.sh -outfile 'install.ps1'
-          .\install.ps1 -RunAsAdmin
-          scoop
           echo "* Show Scoop version"
           scoop --version
           echo "* Show Scoop buckets"
@@ -42,5 +37,8 @@ jobs:
           scoop list
           echo "* Install git"
           scoop install git
+      - name: Run Unit Test
+        shell: pwsh
+        run: |
           echo "* Begin test"
           Invoke-Pester -CI
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ jobs:
         shell: bash
         env:
           REF: ${{ github.ref }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: . ./publish.ps1 -Version $env:GIT_TAG
         shell: pwsh
       - uses: actions/upload-artifact@v2