From 0507f6b1088e498f9ee5fdbb50e59dbf645fec12 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Wed, 10 May 2023 17:01:42 -0400 Subject: [PATCH] update gha to new stuff --- .github/workflows/pr-docs-tests.yml | 4 +-- .github/workflows/pr-es-tests.yml | 51 ++++++++++------------------- .github/workflows/pr-linter.yml | 4 +-- .github/workflows/pr-unit-tests.yml | 5 +-- .github/workflows/release.yml | 4 +-- actions-lando-config.yml | 14 -------- package.json | 4 +-- yarn.lock | 18 +++++----- 8 files changed, 38 insertions(+), 66 deletions(-) delete mode 100644 actions-lando-config.yml diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml index 9d59b61..8984dc1 100644 --- a/.github/workflows/pr-docs-tests.yml +++ b/.github/workflows/pr-docs-tests.yml @@ -15,9 +15,9 @@ jobs: steps: # Install deps and cache - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: yarn diff --git a/.github/workflows/pr-es-tests.yml b/.github/workflows/pr-es-tests.yml index 8845233..ed3d16e 100644 --- a/.github/workflows/pr-es-tests.yml +++ b/.github/workflows/pr-es-tests.yml @@ -9,14 +9,15 @@ jobs: env: TERM: xterm strategy: + fail-fast: false matrix: - leia-tests: + leia-test: - examples/5.x - examples/6.x - examples/7.x - examples/custom - lando-versions: - - edge + lando-version: + - 3-dev os: - ubuntu-22.04 node-version: @@ -32,37 +33,21 @@ jobs: cache: yarn - 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: Grab latest edge Lando CLI - run: | - sudo curl -fsSL -o /usr/local/bin/lando "https://files.lando.dev/cli/lando-linux-x64-${{ matrix.lando-versions }}" - sudo chmod +x /usr/local/bin/lando - - name: Move in lando config appropriate for testing - run: | - mkdir -p ~/.lando/cache - cp -f actions-lando-config.yml ~/.lando/config.yml - echo false > ~/.lando/cache/report_errors - lando --clear + - name: Setup lando ${{ matrix.lando-version }} + uses: lando/setup-lando@v2 + with: + lando-version: ${{ matrix.lando-version }} + config: | + plugins.@lando/elasticsearch=/home/runner/work/elasticsearch/elasticsearch + telemetry: false - name: Verify Lando works and we are dogfooding this plugin for tests run: | lando version lando config --path plugins | grep elasticsearch | grep /home/runner/work/elasticsearch/elasticsearch || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1) - - # This block should eventually become use lando/actions-leia@v2 - # @NOTE? Do we want a way for our leia-action to configure apparmor since - # this might break a whole bunch of tests? or is this literally just a thing - # for the Lagoon mysql/mariadb container? - - name: Configure apparmor - run: | - set -x - sudo apt-get remove mysql-server --purge - sudo apt-get install apparmor-profiles - sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - - name: Run leia tests - shell: bash - run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash + - name: Run Leia Tests + uses: lando/run-leia-action@v2 + with: + leia-test: "./${{ matrix.leia-test }}/README.md" + cleanup-header: "Destroy tests" + shell: bash + stdin: true diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml index c9be28b..1025437 100644 --- a/.github/workflows/pr-linter.yml +++ b/.github/workflows/pr-linter.yml @@ -15,9 +15,9 @@ jobs: steps: # Install deps and cache - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: yarn diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index 9e3a4e2..9f1ed15 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -7,6 +7,7 @@ jobs: unit-tests: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: - windows-2022 @@ -17,9 +18,9 @@ jobs: steps: # Install deps and cache - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: yarn diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0daf9a4..5139618 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,9 +21,9 @@ jobs: steps: # Install deps and cache - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org diff --git a/actions-lando-config.yml b/actions-lando-config.yml deleted file mode 100644 index f01e378..0000000 --- a/actions-lando-config.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Disable the "core" elasticsearch plugins -disablePlugins: - - lando-elasticsearch - -# Make sure we are dogfooding this plugin for testing purposes -plugins: - "@lando/elasticsearch": /home/runner/work/elasticsearch/elasticsearch - -# Disable metrics reporting -stats: - - report: false - url: https://metrics.lando.dev - - diff --git a/package.json b/package.json index 90f3606..ca5b989 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.16.0", - "@lando/leia": "^0.6.4", + "@lando/leia": "^0.6.5", "@lando/vuepress-theme-default-plus": "1.0.0-beta.44", "bundle-dependencies": "^1.0.2", "chai": "^4.3.4", @@ -63,4 +63,4 @@ "version-bump-prompt": "^4.2.1", "vuepress": "2.0.0-beta.53" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 64affdb..01e218d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -451,10 +451,10 @@ resolved "https://registry.yarnpkg.com/@lando/argv/-/argv-1.1.0.tgz#96ba39e6a0498995c7abbbaff1794d71f827cd78" integrity sha512-nBM6Rk1XorQdxad0CJTxDaNKrj+ITUg3u9rZYrOiF1KI5oImBJRBKjwf1EhnktJ63HmLGTq+sZQsR8veJmf1GQ== -"@lando/leia@^0.6.4": - version "0.6.4" - resolved "https://registry.yarnpkg.com/@lando/leia/-/leia-0.6.4.tgz#246149798f00bb50530f300b16c5d8718a6b134b" - integrity sha512-lSFJftURdfGrz+an77sGNi7gC8VnsxY0H9a/HX5X71lRqlsAL14x1rDQfrHb6kHSbI3621cEvw+22blTo3ol3A== +"@lando/leia@^0.6.5": + version "0.6.5" + resolved "https://registry.yarnpkg.com/@lando/leia/-/leia-0.6.5.tgz#38a92c070042f2630e192778e892107798fb86d5" + integrity sha512-CssUrscDgc7ruw4IRkdmPHumgK7X6THBD71XUgyUREEi2sx5nkgL828hqJHwm8VOLCWm5ZIQxLsprstjai69MA== dependencies: "@lando/argv" "^1.0.6" "@oclif/command" "^1.8.0" @@ -470,7 +470,7 @@ fs-extra "^7.0.1" glob "^7.1.3" lodash "^4.17.11" - marked "^0.7.0" + marked "^4.0.10" mocha "^5.2.0" object-hash "^2.2.0" @@ -3249,10 +3249,10 @@ markdown-it@^13.0.1: mdurl "^1.0.1" uc.micro "^1.0.5" -marked@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e" - integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== +marked@^4.0.10: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== md5-hex@^4.0.0: version "4.0.0"