From efed5e61a29ef58ea25ac1ef30c2c4c521cfe11d Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 17:22:48 +0200 Subject: [PATCH 01/14] ci: update Core Tests workflow --- .github/workflows/pr-core-tests.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-core-tests.yml b/.github/workflows/pr-core-tests.yml index e6a49d662..88f62f929 100644 --- a/.github/workflows/pr-core-tests.yml +++ b/.github/workflows/pr-core-tests.yml @@ -11,9 +11,9 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 + - ubuntu-latest node-version: - - '16' + - 'lts/*' leia-tests: - basics-example - badname-example @@ -32,20 +32,12 @@ jobs: # Eventually it would be great if these steps could live in a separate YAML file # that could be included in line to avoid code duplication - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Get Yarn cache directory - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Use Yarn cache - uses: actions/cache@v2 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} + cache: yarn - name: Install Yarn dependencies run: yarn install --prefer-offline --frozen-lockfile From 07a611e6067774ec15d77db5f94793ef3185514d Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 17:50:54 +0200 Subject: [PATCH 02/14] ci: update Lint Code workflow --- .github/workflows/pr-linter.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml index 274aa75ba..e960057ad 100644 --- a/.github/workflows/pr-linter.yml +++ b/.github/workflows/pr-linter.yml @@ -9,29 +9,21 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 + - ubuntu-latest node-version: - - '16' + - 'lts/*' steps: # Install deps and cache # Eventually it would be great if these steps could live in a separate YAML file # that could be included in line to avoid code duplication - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Get Yarn cache directory - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Use Yarn cache - uses: actions/cache@v2 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} + cache: yarn - name: Install Yarn dependencies run: yarn install --prefer-offline --frozen-lockfile From 26feb5a77f2eb46576a8690279f834b1690731b3 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 17:51:42 +0200 Subject: [PATCH 03/14] ci: update Check Plugins Installed workflow --- .github/workflows/pr-plugins-installed.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-plugins-installed.yml b/.github/workflows/pr-plugins-installed.yml index 2ed91e464..fa9bfbec6 100644 --- a/.github/workflows/pr-plugins-installed.yml +++ b/.github/workflows/pr-plugins-installed.yml @@ -5,7 +5,7 @@ on: jobs: buildx: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: TERM: xterm strategy: @@ -46,26 +46,20 @@ jobs: - tomcat - wordpress - varnish + node-version: + - 'lts/*' steps: # Install deps and cache # Eventually it would be great if these steps could live in a separate YAML file # that could be included in line to avoid code duplication - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Get Yarn cache directory - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Use Yarn cache - uses: actions/cache@v2 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} + cache: yarn - name: Install Yarn dependencies run: yarn install --prefer-offline --frozen-lockfile From 897c0d63c4a97c764caf9e9c12f2dfbeaac01ad4 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 17:54:38 +0200 Subject: [PATCH 04/14] ci: update Run Unit Tests workflow --- .github/workflows/pr-unit-tests.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index d5dc7cda1..f3ac41b3c 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -13,27 +13,19 @@ jobs: - ubuntu-latest - macos-latest node-version: - - '18' + - 'lts/*' steps: # Install deps and cache # Eventually it would be great if these steps could live in a separate YAML file # that could be included in line to avoid code duplication - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Get Yarn cache directory - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Use Yarn cache - uses: actions/cache@v2 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} + cache: yarn - name: Install Yarn dependencies run: yarn install --prefer-offline --frozen-lockfile From 109d63de8c0d620f4de179bcd1592aadd665331d Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:03:08 +0200 Subject: [PATCH 05/14] ci: update PR Release Tests workflow --- .github/workflows/pr-release-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-release-tests.yml b/.github/workflows/pr-release-tests.yml index e67c24a42..912f7de42 100644 --- a/.github/workflows/pr-release-tests.yml +++ b/.github/workflows/pr-release-tests.yml @@ -5,7 +5,7 @@ on: jobs: package: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: TERM: xterm strategy: @@ -14,18 +14,18 @@ jobs: - x64 - arm64 node-version: - - 16 + - '16' os: - linux - macos - win steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: yarn @@ -37,7 +37,7 @@ jobs: node ./scripts/dev-version.js node ./bin/lando version - name: Package into node binary - uses: lando/pkg-action@v2 + uses: lando/pkg-action@v5 id: pkg-action with: entrypoint: bin/lando.js From 9616a6553d2a7220e3eba5018d2ddeea550518bf Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:05:51 +0200 Subject: [PATCH 06/14] test: unit tests do not work with Node 20 --- .github/workflows/pr-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index f3ac41b3c..6df0fd1e1 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -13,7 +13,7 @@ jobs: - ubuntu-latest - macos-latest node-version: - - 'lts/*' + - '18' steps: # Install deps and cache From 7349a09490daaf2fc98b8c96aff9205221d625f8 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:09:08 +0200 Subject: [PATCH 07/14] ci: downgrade to lando/pkg-action@v2 --- .github/workflows/pr-release-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-release-tests.yml b/.github/workflows/pr-release-tests.yml index 912f7de42..192dc021e 100644 --- a/.github/workflows/pr-release-tests.yml +++ b/.github/workflows/pr-release-tests.yml @@ -37,7 +37,7 @@ jobs: node ./scripts/dev-version.js node ./bin/lando version - name: Package into node binary - uses: lando/pkg-action@v5 + uses: lando/pkg-action@v2 id: pkg-action with: entrypoint: bin/lando.js From b327224c930a0c98760b55b9c89208f4608d565c Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:14:02 +0200 Subject: [PATCH 08/14] ci: update Build Utility Images workflow --- .github/workflows/build-util-images.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-util-images.yml b/.github/workflows/build-util-images.yml index db9179535..61a239de5 100644 --- a/.github/workflows/build-util-images.yml +++ b/.github/workflows/build-util-images.yml @@ -9,7 +9,7 @@ on: jobs: buildx: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: TERM: xterm strategy: @@ -21,12 +21,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 with: install: true - name: Available platforms @@ -41,7 +41,7 @@ jobs: # username: ${{ secrets.DOCKERHUB_USERNAME }} # password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push devwithlando/${{ matrix.image }}:${{ matrix.tag }}${{ steps.pr.outputs.TAG_SUFFIX }} - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ${{ matrix.context }} platforms: linux/amd64,linux/arm64 From d77e07df28ff57a917f53ba695823031764f6677 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:17:31 +0200 Subject: [PATCH 09/14] ci: update Create Dev Releases workflow --- .github/workflows/dev-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index 8ff3b1c3b..eb680eb97 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -8,7 +8,7 @@ on: jobs: package: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: TERM: xterm strategy: @@ -24,11 +24,11 @@ jobs: - win steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: yarn From e2b407e3ea04cbf24c7ffcd2596ab130fa74c567 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:17:53 +0200 Subject: [PATCH 10/14] ci: remove Create Releases workflow --- .github/workflows/release.yml | 149 ---------------------------------- 1 file changed, 149 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 99bc28494..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,149 +0,0 @@ -name: Create Releases - -on: - release: - types: - - published - - edited - -jobs: - package: - runs-on: ubuntu-20.04 - env: - TERM: xterm - strategy: - matrix: - arch: - - x64 - - arm64 - node-version: - - 16 - os: - - linux - - macos - - win - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - cache: yarn - - name: Install Yarn dependencies - run: yarn install --prefer-offline --frozen-lockfile --production - - name: Reset version if needed - run: | - yarn add @lando/argv@^1.1.0 - node ./scripts/dev-version.js - node ./bin/lando version - - name: Package into node binary - uses: lando/pkg-action@v2 - with: - entrypoint: bin/lando.js - arch: ${{ matrix.arch }} - node-version: node${{ matrix.node-version }} - os: ${{ matrix.os }} - - # sign-n-deploy: - # runs-on: ${{ matrix.os }} - # needs: - # - package - # env: - # TERM: xterm - # strategy: - # matrix: - # include: - # - os: windows-2022 - # key: cli-node14-win-x64-${{ github.sha }} - # file: lando/cli.exe - # certificate-data: WINDOZE_CERT_DATA - # certificate-password: WINDOZE_CERT_PASSWORD - # result: lando-win-x64-${{ github.ref_name }}.exe - # - os: windows-2022 - # key: cli-node14-win-arm64-${{ github.sha }} - # file: lando/cli.exe - # certificate-data: WINDOZE_CERT_DATA - # certificate-password: WINDOZE_CERT_PASSWORD - # result: lando-win-arm64-${{ github.ref_name }}.exe - # - os: macos-11 - # key: cli-node14-macos-x64-${{ github.sha }} - # file: lando/cli - # certificate-data: APPLE_CERT_DATA - # certificate-password: APPLE_CERT_PASSWORD - # apple-product-id: dev.lando.cli - # apple-team-id: FY8GAUX282 - # apple-notary-user: APPLE_NOTARY_USER - # apple-notary-password: APPLE_NOTARY_PASSWORD - # options: --options runtime --entitlements entitlements.xml - # result: lando-macos-x64-${{ github.ref_name }} - # - os: macos-11 - # key: cli-node14-macos-arm64-${{ github.sha }} - # file: lando/cli - # certificate-data: APPLE_CERT_DATA - # certificate-password: APPLE_CERT_PASSWORD - # apple-product-id: dev.lando.cli - # apple-team-id: FY8GAUX282 - # apple-notary-user: APPLE_NOTARY_USER - # apple-notary-password: APPLE_NOTARY_PASSWORD - # options: --options runtime --entitlements entitlements.xml - # result: lando-macos-arm64-${{ github.ref_name }} - # - os: ubuntu-20.04 - # key: cli-node14-linux-x64-${{ github.sha }} - # file: lando/cli - # result: lando-linux-x64-${{ github.ref_name }} - # - os: ubuntu-20.04 - # key: cli-node14-linux-arm64-${{ github.sha }} - # file: lando/cli - # result: lando-linux-arm64-${{ github.ref_name }} - - # steps: - # - name: Checkout code - # uses: actions/checkout@v2 - # - name: Download ${{ matrix.key }} - # uses: actions/download-artifact@v3 - # with: - # name: ${{ matrix.key }} - # path: lando - # - name: Sign and Notarize - # uses: lando/code-sign-action@v2 - # id: code-sign-action - # with: - # file: ${{ matrix.file }} - # certificate-data: ${{ secrets[matrix.certificate-data] }} - # certificate-password: ${{ secrets[matrix.certificate-password] }} - # apple-notary-user: ${{ secrets[matrix.apple-notary-user] }} - # apple-notary-password: ${{ secrets[matrix.apple-notary-password] }} - # apple-product-id: ${{ matrix.apple-product-id }} - # apple-team-id: ${{ matrix.apple-team-id }} - # options: ${{ matrix.options }} - # - name: Rename as needed - # shell: bash - # run: | - # mkdir -p releases - # cp ${{ steps.code-sign-action.outputs.file }} releases/${{ matrix.result }} - # if [ "${{ github.event.release.prerelease }}" == "false" ]; then - # cp releases/${{ matrix.result }} "releases/$(echo ${{ matrix.result }} | sed 's/${{ github.ref_name }}/stable/;')" - # else - # cp releases/${{ matrix.result }} "releases/$(echo ${{ matrix.result }} | sed 's/${{ github.ref_name }}/edge/;')" - # fi - # chmod +x releases/* - # ls -lsa releases - # - name: Configure S3 Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 - # - name: Upload releases to S3 - # shell: bash - # run: aws s3 sync releases s3://files.lando.dev/cli --acl public-read - # - name: Upload releases to GitHub Releases - # uses: softprops/action-gh-release@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # files: releases/${{ matrix.result }} - # fail_on_unmatched_files: true From 02bed53fb1db89628f92e2fe4796e885a7dae496 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:18:45 +0200 Subject: [PATCH 11/14] ci: remove Create Dev Releases workflow --- .github/workflows/dev-release.yml | 139 ------------------------------ 1 file changed, 139 deletions(-) delete mode 100644 .github/workflows/dev-release.yml diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml deleted file mode 100644 index eb680eb97..000000000 --- a/.github/workflows/dev-release.yml +++ /dev/null @@ -1,139 +0,0 @@ -name: Create Dev Releases - -on: - push: - branches: - - main - - 'preview/**' - -jobs: - package: - runs-on: ubuntu-latest - env: - TERM: xterm - strategy: - matrix: - arch: - - x64 - - arm64 - node-version: - - 16 - os: - - linux - - macos - - win - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - cache: yarn - - name: Install Yarn dependencies - run: yarn install --prefer-offline --frozen-lockfile --production - - name: Reset version if needed - run: | - yarn add @lando/argv@^1.1.0 - node ./scripts/dev-version.js - node ./bin/lando version - - name: Package into node binary - uses: lando/pkg-action@v2 - with: - entrypoint: bin/lando.js - arch: ${{ matrix.arch }} - node-version: node${{ matrix.node-version }} - os: ${{ matrix.os }} - - # sign-n-deploy: - # runs-on: ${{ matrix.os }} - # needs: - # - package - # env: - # TERM: xterm - # strategy: - # matrix: - # include: - # - os: windows-2022 - # key: cli-node14-win-x64-${{ github.sha }} - # file: lando/cli.exe - # certificate-data: WINDOZE_CERT_DATA - # certificate-password: WINDOZE_CERT_PASSWORD - # result: lando-win-x64-${{ github.ref_name }}.exe - # - os: windows-2022 - # key: cli-node14-win-arm64-${{ github.sha }} - # file: lando/cli.exe - # certificate-data: WINDOZE_CERT_DATA - # certificate-password: WINDOZE_CERT_PASSWORD - # result: lando-win-arm64-${{ github.ref_name }}.exe - # - os: macos-11 - # key: cli-node14-macos-x64-${{ github.sha }} - # file: lando/cli - # certificate-data: APPLE_CERT_DATA - # certificate-password: APPLE_CERT_PASSWORD - # apple-product-id: dev.lando.cli - # apple-team-id: FY8GAUX282 - # apple-notary-user: APPLE_NOTARY_USER - # apple-notary-password: APPLE_NOTARY_PASSWORD - # options: --options runtime --entitlements entitlements.xml - # result: lando-macos-x64-${{ github.ref_name }} - # - os: macos-11 - # key: cli-node14-macos-arm64-${{ github.sha }} - # file: lando/cli - # certificate-data: APPLE_CERT_DATA - # certificate-password: APPLE_CERT_PASSWORD - # apple-product-id: dev.lando.cli - # apple-team-id: FY8GAUX282 - # apple-notary-user: APPLE_NOTARY_USER - # apple-notary-password: APPLE_NOTARY_PASSWORD - # options: --options runtime --entitlements entitlements.xml - # result: lando-macos-arm64-${{ github.ref_name }} - # - os: ubuntu-20.04 - # key: cli-node14-linux-x64-${{ github.sha }} - # file: lando/cli - # result: lando-linux-x64-${{ github.ref_name }} - # - os: ubuntu-20.04 - # key: cli-node14-linux-arm64-${{ github.sha }} - # file: lando/cli - # result: lando-linux-arm64-${{ github.ref_name }} - # steps: - # - name: Checkout code - # uses: actions/checkout@v2 - # - name: Download ${{ matrix.key }} - # uses: actions/download-artifact@v3 - # with: - # name: ${{ matrix.key }} - # path: lando - # - name: Sign and Notarize - # uses: lando/code-sign-action@v2 - # id: code-sign-action - # with: - # file: ${{ matrix.file }} - # certificate-data: ${{ secrets[matrix.certificate-data] }} - # certificate-password: ${{ secrets[matrix.certificate-password] }} - # apple-notary-user: ${{ secrets[matrix.apple-notary-user] }} - # apple-notary-password: ${{ secrets[matrix.apple-notary-password] }} - # apple-product-id: ${{ matrix.apple-product-id }} - # apple-team-id: ${{ matrix.apple-team-id }} - # options: ${{ matrix.options }} - # - name: Rename as needed - # shell: bash - # run: | - # mkdir -p releases - # cp ${{ steps.code-sign-action.outputs.file }} releases/${{ matrix.result }} - # cp releases/${{ matrix.result }} "releases/$(echo ${{ matrix.result }} | sed 's/${{ github.ref_name }}/latest/;')" - # cp releases/${{ matrix.result }} "releases/$(echo ${{ matrix.result }} | sed 's/${{ github.ref_name }}/dev/;')" - # chmod +x releases/* - # ls -lsa releases - # - name: Configure S3 Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 - # - name: Upload dev releases to S3 - # shell: bash - # run: aws s3 sync releases s3://files.lando.dev/cli --acl public-read - From f18102480f4f9d80882dba43089f38968446a4de Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:19:23 +0200 Subject: [PATCH 12/14] ci: update Database Tools Tests workflow --- .github/workflows/pr-db-tools-tests.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-db-tools-tests.yml b/.github/workflows/pr-db-tools-tests.yml index e76d8f8c1..0d968e676 100644 --- a/.github/workflows/pr-db-tools-tests.yml +++ b/.github/workflows/pr-db-tools-tests.yml @@ -11,9 +11,9 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 + - ubuntu-latest node-version: - - '16' + - 'lts/*' leia-tests: - sql-export-example - sql-import-example @@ -23,20 +23,12 @@ jobs: # Eventually it would be great if these steps could live in a separate YAML file # that could be included in line to avoid code duplication - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Get Yarn cache directory - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Use Yarn cache - uses: actions/cache@v2 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} + cache: yarn - name: Install Yarn dependencies run: yarn install --prefer-offline --frozen-lockfile From 4e3a2b022c5ae1b137dc8735c83ac774f24a97f4 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 18:19:42 +0200 Subject: [PATCH 13/14] ci: update Django Tests workflow --- .github/workflows/pr-django-tests.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-django-tests.yml b/.github/workflows/pr-django-tests.yml index ed7fc4edf..d643a237f 100644 --- a/.github/workflows/pr-django-tests.yml +++ b/.github/workflows/pr-django-tests.yml @@ -11,9 +11,9 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 + - ubuntu-latest node-version: - - '16' + - 'lts/*' leia-tests: - django-example steps: @@ -22,20 +22,12 @@ jobs: # Eventually it would be great if these steps could live in a separate YAML file # that could be included in line to avoid code duplication - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install node ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Get Yarn cache directory - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - name: Use Yarn cache - uses: actions/cache@v2 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} + cache: yarn - name: Install Yarn dependencies run: yarn install --prefer-offline --frozen-lockfile From a7f104d628aa9e2977a4fc42cb0c2f94c6bcd7d2 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Wed, 27 Mar 2024 19:14:20 +0200 Subject: [PATCH 14/14] chore: update tools versions --- .node-version | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.node-version b/.node-version index 0e94e314c..18c284172 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -16.0.0 \ No newline at end of file +20.11.0 \ No newline at end of file diff --git a/.tool-versions b/.tool-versions index 35830be2c..557ea46d2 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -nodejs 16.0.0 +nodejs 20.11.0