update gha workflows to use new @lando/setup-actions features

lando · Aug 19, 2023 · 1237e51 · 1237e51
1 parent 86a145c
commit 1237e51
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/.github/workflows/pr-plugins-installed.yml b/.github/workflows/pr-plugins-installed.yml
@@ -63,25 +63,14 @@ jobs:
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
 
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      # - name: Install via hyperdrive if above is bad
-      - name: Disable usage and error reporting
-        run: |
-          mkdir -p ~/.lando/cache
-          echo false > ~/.lando/cache/report_errors
-          sed -i "s/report: true.*/report: false/" config.yml
+      # package cli so we can use that in setup lando
       - name: Package CLI
         run: yarn cli:build
-      - name: Replace source CLI with packaged one
-        run: sudo mv ./dist/@lando/cli /usr/local/bin/lando
-      - name: Verify we can run the packaged CLI
-        run: |
-          lando version
-          lando config
+      - name: Setup locally built lando
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ./dist/@lando/cli
+          telemetry: false
 
       # Checks to make sure the plugins listed in the matrix have the right path
       - name: Check if @lando/${{ matrix.plugins }} is installed correctly

diff --git a/.github/workflows/pr-runtime-tests.yml b/.github/workflows/pr-runtime-tests.yml
@@ -8,7 +8,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       TERM: xterm
-      # DEBUG: "lando*"
     strategy:
       fail-fast: false
       matrix:
@@ -36,30 +35,22 @@ jobs:
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
 
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      # - name: Install via hyperdrive if above is bad
-      - name: Disable usage and error reporting
-        run: |
-          mkdir -p ~/.lando/cache
-          echo false > ~/.lando/cache/report_errors
-          sed -i "s/report: true.*/report: false/" config.yml
-
       # @TODO: once we are no longer using github:lando/core-next#main as the repo for @lando/core-next
       # eg once we are pulling a package from npm we can remove this
       - name: Update to latest core-next
         run: |
           yarn upgrade @lando/core-next
           git diff
 
+      # package cli so we can use that in setup lando
       - name: Package CLI
         run: yarn cli:build
-      - name: Replace source CLI with packaged one
-        run: sudo mv ./dist/@lando/cli /usr/local/bin/lando
-      - name: Verify we can run the packaged CLI
+      - name: Setup locally built lando
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ./dist/@lando/cli
+          telemetry: false
+      - name: Verify we can run the packaged CLI in both runtimes
         run: |
           # v3 things
           lando version