From 44a8943056a992394662d8999c597aa4cfbeeb80 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:25:32 +0000 Subject: [PATCH 01/12] Add rust cache to rust dependant jobs --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 978e61b8..bb0812c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,9 @@ jobs: toolchain: stable profile: minimal components: rustfmt + - uses: Swatinem/rust-cache@v2 + with: + shared-key: rust-cache - run: cargo fmt --all -- --check - run: cargo clippy -- -Dwarnings @@ -50,6 +53,9 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: .node-version + - uses: Swatinem/rust-cache@v2 + with: + shared-key: rust-cache - run: yarn # Need to build scripts to get rust bindings - run: yarn --silent ts-node src/config/Defaults.ts --config | diff config.sample.yml - @@ -61,6 +67,9 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: .node-version + - uses: Swatinem/rust-cache@v2 + with: + shared-key: rust-cache - run: yarn # Need to build scripts to get rust bindings - run: yarn --silent ts-node ./scripts/build-metrics-docs.ts | diff docs/metrics.md - From b491251a99fdc437c3962c65266d281ce4b65bed Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:26:18 +0000 Subject: [PATCH 02/12] Don't run test until linter passes --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb0812c3..365d4827 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,6 +76,9 @@ jobs: test: # Test on LTS-1 runs-on: ubuntu-20.04 + needs: + - lint-node + - lint-rust strategy: matrix: node_version: [20, 21] From 10d65eb295e5ef7bb950d850f2235edf7a4905da Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:37:59 +0000 Subject: [PATCH 03/12] Allow hookshot to build faster in CI --- .github/workflows/main.yml | 12 ++++++++++++ package.json | 2 +- scripts/build-app.sh | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 365d4827..9db6d544 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,6 +47,11 @@ jobs: config: runs-on: ubuntu-latest + needs: + # for cache population + - lint-rust + env: + HOOKSHOT_BUILD_PROFILE: dev steps: - uses: actions/checkout@v3 - name: Use Node.js @@ -60,7 +65,12 @@ jobs: - run: yarn --silent ts-node src/config/Defaults.ts --config | diff config.sample.yml - metrics-docs: + needs: + # for cache population + - lint-rust runs-on: ubuntu-latest + env: + HOOKSHOT_BUILD_PROFILE: dev steps: - uses: actions/checkout@v3 - name: Use Node.js @@ -76,6 +86,8 @@ jobs: test: # Test on LTS-1 runs-on: ubuntu-20.04 + env: + HOOKSHOT_BUILD_PROFILE: dev needs: - lint-node - lint-rust diff --git a/package.json b/package.json index 68f75d73..6d34e39b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "scripts": { "build:web": "vite build", "build:app": "tsc --project tsconfig.json", - "build:app:rs": "napi build --dts ../src/libRs.d.ts --release ./lib", + "build:app:rs": "napi build --dts ../src/libRs.d.ts --profile $HOOKSHOT_BUILD_PROFILE ./lib", "build:app:fix-defs": "ts-node scripts/definitions-fixer.ts src/libRs.d.ts", "build:docs": "ts-node scripts/build-metrics-docs.ts > docs/metrics.md && mdbook build", "dev:web": "vite dev", diff --git a/scripts/build-app.sh b/scripts/build-app.sh index 6a8fdce4..74bc2654 100755 --- a/scripts/build-app.sh +++ b/scripts/build-app.sh @@ -1,8 +1,10 @@ -#!/bin/bash +#!/usr/bin/env bash # exit when any command fails set -e +export HOOKSHOT_BUILD_PROFILE="${HOOKSHOT_BUILD_PROFILE:-release}" + echo "Building Rust layer" yarn run build:app:rs echo "Running rust-typescript definitions fix" From 830304c88202847f962db180a4d9a44c552b95bf Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:47:35 +0000 Subject: [PATCH 04/12] Fix dev builds --- .github/workflows/main.yml | 8 +++++--- package.json | 2 +- scripts/build-app.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9db6d544..ef54ba47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: # for cache population - lint-rust env: - HOOKSHOT_BUILD_PROFILE: dev + HOOKSHOT_BUILD_PROFILE: " " # This is equivalent to dev steps: - uses: actions/checkout@v3 - name: Use Node.js @@ -70,7 +70,7 @@ jobs: - lint-rust runs-on: ubuntu-latest env: - HOOKSHOT_BUILD_PROFILE: dev + HOOKSHOT_BUILD_PROFILE: " " steps: - uses: actions/checkout@v3 - name: Use Node.js @@ -87,7 +87,7 @@ jobs: # Test on LTS-1 runs-on: ubuntu-20.04 env: - HOOKSHOT_BUILD_PROFILE: dev + HOOKSHOT_BUILD_PROFILE: " " needs: - lint-node - lint-rust @@ -149,6 +149,8 @@ jobs: needs: - test - build-homerunner + env: + HOOKSHOT_BUILD_PROFILE: " " steps: - name: Install Complement Dependencies run: | diff --git a/package.json b/package.json index 6d34e39b..db23c744 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "scripts": { "build:web": "vite build", "build:app": "tsc --project tsconfig.json", - "build:app:rs": "napi build --dts ../src/libRs.d.ts --profile $HOOKSHOT_BUILD_PROFILE ./lib", + "build:app:rs": "napi build --dts ../src/libRs.d.ts $HOOKSHOT_BUILD_PROFILE ./lib", "build:app:fix-defs": "ts-node scripts/definitions-fixer.ts src/libRs.d.ts", "build:docs": "ts-node scripts/build-metrics-docs.ts > docs/metrics.md && mdbook build", "dev:web": "vite dev", diff --git a/scripts/build-app.sh b/scripts/build-app.sh index 74bc2654..437f0511 100755 --- a/scripts/build-app.sh +++ b/scripts/build-app.sh @@ -3,7 +3,7 @@ # exit when any command fails set -e -export HOOKSHOT_BUILD_PROFILE="${HOOKSHOT_BUILD_PROFILE:-release}" +export HOOKSHOT_BUILD_PROFILE="${HOOKSHOT_BUILD_PROFILE:---release}" echo "Building Rust layer" yarn run build:app:rs From 55dc4aa8a68fef01ee5c8bbaa69539927896b682 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:53:40 +0000 Subject: [PATCH 05/12] use 22.04 --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef54ba47..2d27acc0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ concurrency: jobs: lint-node: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Use Node.js @@ -31,7 +31,7 @@ jobs: - run: yarn lint:js lint-rust: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 @@ -46,7 +46,7 @@ jobs: - run: cargo clippy -- -Dwarnings config: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: # for cache population - lint-rust @@ -68,7 +68,7 @@ jobs: needs: # for cache population - lint-rust - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: HOOKSHOT_BUILD_PROFILE: " " steps: @@ -85,7 +85,7 @@ jobs: test: # Test on LTS-1 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: HOOKSHOT_BUILD_PROFILE: " " needs: @@ -111,7 +111,7 @@ jobs: - run: yarn test:cover build-homerunner: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: homerunnersha: ${{ steps.gitsha.outputs.sha }} steps: @@ -144,7 +144,7 @@ jobs: go build ./cmd/homerunner integration-test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 30 needs: - test From 3ea9582a4a702ed7d694ac23dfff56defd38e41c Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:54:54 +0000 Subject: [PATCH 06/12] indent --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d27acc0..20e9a401 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ concurrency: jobs: lint-node: - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Use Node.js From 70f7edc317f85840a921171e3ea45499f55a5cbd Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:56:45 +0000 Subject: [PATCH 07/12] clean up mess --- .github/workflows/main.yml | 38 +++++++++++++++++++------------------- changelog.d/916.bugfix | 1 + 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 changelog.d/916.bugfix diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20e9a401..2e6a1664 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,30 +20,30 @@ concurrency: jobs: lint-node: - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - name: Use Node.js - uses: actions/setup-node@v3 - with: - node-version-file: .node-version - - run: yarn --ignore-scripts - - run: yarn lint:js + - uses: actions/checkout@v3 + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version-file: .node-version + - run: yarn --ignore-scripts + - run: yarn lint:js lint-rust: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - components: rustfmt - - uses: Swatinem/rust-cache@v2 - with: - shared-key: rust-cache - - run: cargo fmt --all -- --check - - run: cargo clippy -- -Dwarnings + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + profile: minimal + components: rustfmt + - uses: Swatinem/rust-cache@v2 + with: + shared-key: rust-cache + - run: cargo fmt --all -- --check + - run: cargo clippy -- -Dwarnings config: runs-on: ubuntu-22.04 diff --git a/changelog.d/916.bugfix b/changelog.d/916.bugfix new file mode 100644 index 00000000..b7641f93 --- /dev/null +++ b/changelog.d/916.bugfix @@ -0,0 +1 @@ +Cache more dependencies in CI to speed up runs. From fc5653a659aa25690ec538e9782c6a593e4168a7 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 11:59:15 +0000 Subject: [PATCH 08/12] update actions/ deps --- .github/workflows/docker-hub-latest.yml | 2 +- .github/workflows/docker-hub-release.yml | 2 +- .github/workflows/docs-latest.yml | 2 +- .github/workflows/docs-release.yml | 2 +- .github/workflows/helm-lint.yml | 2 +- .github/workflows/helm.yml | 2 +- .github/workflows/main.yml | 18 +++++++++--------- .github/workflows/newsfile.yml | 2 +- .github/workflows/release.yml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker-hub-latest.yml b/.github/workflows/docker-hub-latest.yml index 99fdb119..9db91cc0 100644 --- a/.github/workflows/docker-hub-latest.yml +++ b/.github/workflows/docker-hub-latest.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/.github/workflows/docker-hub-release.yml b/.github/workflows/docker-hub-release.yml index acf58f1d..3fb9e000 100644 --- a/.github/workflows/docker-hub-release.yml +++ b/.github/workflows/docker-hub-release.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get release tag run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Set up QEMU diff --git a/.github/workflows/docs-latest.yml b/.github/workflows/docs-latest.yml index 1223db3b..7d926357 100644 --- a/.github/workflows/docs-latest.yml +++ b/.github/workflows/docs-latest.yml @@ -13,7 +13,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml index d492fb7f..b5a8b442 100644 --- a/.github/workflows/docs-release.yml +++ b/.github/workflows/docs-release.yml @@ -12,7 +12,7 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 diff --git a/.github/workflows/helm-lint.yml b/.github/workflows/helm-lint.yml index 600e5be5..32bf61ee 100644 --- a/.github/workflows/helm-lint.yml +++ b/.github/workflows/helm-lint.yml @@ -14,7 +14,7 @@ jobs: lint-helm: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Lint Helm uses: WyriHaximus/github-action-helm3@v3 diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 15d50742..e42604e6 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e6a1664..fd6f85c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: lint-node: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 with: @@ -33,7 +33,7 @@ jobs: lint-rust: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -53,7 +53,7 @@ jobs: env: HOOKSHOT_BUILD_PROFILE: " " # This is equivalent to dev steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 with: @@ -72,7 +72,7 @@ jobs: env: HOOKSHOT_BUILD_PROFILE: " " steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 with: @@ -95,7 +95,7 @@ jobs: matrix: node_version: [20, 21] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node_version }} uses: actions/setup-node@v3 with: @@ -116,7 +116,7 @@ jobs: homerunnersha: ${{ steps.gitsha.outputs.sha }} steps: - name: Checkout matrix-org/complement - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: matrix-org/complement - name: Get complement git sha @@ -124,7 +124,7 @@ jobs: run: echo sha=`git rev-parse --short HEAD` >> "$GITHUB_OUTPUT" - name: Cache homerunner id: cached - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: homerunner key: ${{ runner.os }}-homerunner-${{ steps.gitsha.outputs.sha }} @@ -156,13 +156,13 @@ jobs: run: | sudo apt-get update && sudo apt-get install -y libolm3 - name: Load cached homerunner bin - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: homerunner key: ${{ runner.os }}-homerunner-${{ needs.build-synapse.outputs.homerunnersha }} fail-on-cache-miss: true # Shouldn't happen, we build this in the needs step. - name: Checkout matrix-hookshot - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: matrix-hookshot # Setup node & run tests diff --git a/.github/workflows/newsfile.yml b/.github/workflows/newsfile.yml index ce32d639..21557fa5 100644 --- a/.github/workflows/newsfile.yml +++ b/.github/workflows/newsfile.yml @@ -9,7 +9,7 @@ jobs: changelog: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Needed for comparison fetch-depth: 0 - uses: actions/setup-python@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a7e217e..1d4d97b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ jobs: draft-release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get changelog id: extract-changelog env: From 46f11447fe740096a8fb535222da1fc732eb5a7d Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 12:02:22 +0000 Subject: [PATCH 09/12] drop archived action for rust installation --- .github/workflows/main.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd6f85c4..2edc60dc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,11 +34,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - components: rustfmt + - run: rustup toolchain install stable --profile minimal --component rustfmt - uses: Swatinem/rust-cache@v2 with: shared-key: rust-cache @@ -100,10 +96,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal + - run: rustup toolchain install stable --profile minimal - uses: Swatinem/rust-cache@v2 with: shared-key: rust-cache @@ -170,6 +163,7 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: matrix-hookshot/.node-version + - run: rustup toolchain install stable --profile minimal - uses: Swatinem/rust-cache@v2 with: workspaces: matrix-hookshot From 464686b303331858bef6967ef93271d018d57284 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 19 Mar 2024 12:04:21 +0000 Subject: [PATCH 10/12] setup node --- .github/workflows/docs-latest.yml | 2 +- .github/workflows/docs-release.yml | 2 +- .github/workflows/main.yml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs-latest.yml b/.github/workflows/docs-latest.yml index 7d926357..c15a2cb7 100644 --- a/.github/workflows/docs-latest.yml +++ b/.github/workflows/docs-latest.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: .node-version diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml index b5a8b442..632b23c9 100644 --- a/.github/workflows/docs-release.yml +++ b/.github/workflows/docs-release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: .node-version diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2edc60dc..10054330 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: .node-version - run: yarn --ignore-scripts @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: .node-version - uses: Swatinem/rust-cache@v2 @@ -70,7 +70,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: .node-version - uses: Swatinem/rust-cache@v2 @@ -93,7 +93,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node_version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node_version }} - run: rustup toolchain install stable --profile minimal @@ -160,7 +160,7 @@ jobs: path: matrix-hookshot # Setup node & run tests - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: matrix-hookshot/.node-version - run: rustup toolchain install stable --profile minimal From 40ed7dc192c154bf1f597575a9565cf3ba1f0bf9 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Wed, 20 Mar 2024 11:02:44 +0000 Subject: [PATCH 11/12] see if removing rustup lines helps --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10054330..711d36fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,6 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - run: rustup toolchain install stable --profile minimal --component rustfmt - uses: Swatinem/rust-cache@v2 with: shared-key: rust-cache @@ -96,7 +95,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: ${{ matrix.node_version }} - - run: rustup toolchain install stable --profile minimal - uses: Swatinem/rust-cache@v2 with: shared-key: rust-cache @@ -163,7 +161,6 @@ jobs: uses: actions/setup-node@v4 with: node-version-file: matrix-hookshot/.node-version - - run: rustup toolchain install stable --profile minimal - uses: Swatinem/rust-cache@v2 with: workspaces: matrix-hookshot From 7b01751af3faa6f6039905c288341c23b89e9036 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Wed, 20 Mar 2024 11:03:18 +0000 Subject: [PATCH 12/12] merge metrics docs into config --- .github/workflows/main.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 711d36fa..1eceba7e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,24 +58,6 @@ jobs: shared-key: rust-cache - run: yarn # Need to build scripts to get rust bindings - run: yarn --silent ts-node src/config/Defaults.ts --config | diff config.sample.yml - - - metrics-docs: - needs: - # for cache population - - lint-rust - runs-on: ubuntu-22.04 - env: - HOOKSHOT_BUILD_PROFILE: " " - steps: - - uses: actions/checkout@v4 - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version-file: .node-version - - uses: Swatinem/rust-cache@v2 - with: - shared-key: rust-cache - - run: yarn # Need to build scripts to get rust bindings - run: yarn --silent ts-node ./scripts/build-metrics-docs.ts | diff docs/metrics.md - test: