From 15d7cbef348870a69831da920538d83b8930c844 Mon Sep 17 00:00:00 2001 From: Yohe-Am <56622350+Yohe-Am@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:50:40 +0100 Subject: [PATCH] fix: avoid use of setup-ghjk --- .github/workflows/publish-website.yml | 6 ++++- .github/workflows/release.yml | 24 +++++++++++++++---- .github/workflows/tests.yml | 34 ++++++++++++++++++++------- 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish-website.yml b/.github/workflows/publish-website.yml index 26c6f66d4..1bba63af7 100644 --- a/.github/workflows/publish-website.yml +++ b/.github/workflows/publish-website.yml @@ -29,7 +29,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - uses: actions/cache@v4 with: path: .venv diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f871b1f4d..76454bbd3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,11 @@ jobs: - uses: WyriHaximus/github-action-get-previous-tag@v1.4.0 id: latest-tag - uses: kenji-miyake/setup-git-cliff@v2 - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - shell: bash run: | VERSION=$(ghjk x version-print) @@ -97,7 +101,11 @@ jobs: with: fetch-depth: 0 # some targets don't use cross so will require the deps in the host - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - uses: WyriHaximus/github-action-get-previous-tag@v1.4.0 id: latest-tag - uses: dsherret/rust-toolchain-file@v1 @@ -172,7 +180,11 @@ jobs: id: latest-tag - uses: dsherret/rust-toolchain-file@v1 - uses: mozilla-actions/sccache-action@v0.0.6 - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - shell: bash env: POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }} @@ -305,7 +317,11 @@ jobs: fetch-depth: 0 - uses: dsherret/rust-toolchain-file@v1 - uses: kenji-miyake/setup-git-cliff@v2 - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - id: bump run: | ghjk x version-bump prerelease diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c3aec1570..97aad8945 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,7 +88,11 @@ jobs: run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV - if: ${{ env.AWS_ACCESS_KEY_ID != '' }} uses: mozilla-actions/sccache-action@v0.0.6 - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - shell: bash run: | sudo apt update && sudo apt install -y --no-install-recommends libclang-dev clang @@ -131,10 +135,14 @@ jobs: run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV - if: ${{ env.AWS_ACCESS_KEY_ID != '' }} uses: mozilla-actions/sccache-action@v0.0.6 - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc - with: - # temporary fix - cache-key-prefix: ${{ matrix.os }} + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # with: + # # temporary fix + # cache-key-prefix: ${{ matrix.os }} + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - if: ${{ matrix.cross }} shell: bash env: @@ -158,7 +166,11 @@ jobs: # with: # path: ${{ env.DENO_DIR }} # key: deno-mac-${{ hashFiles('**/deno.lock') }} - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - name: Cache .venv dir uses: actions/cache@v4 with: @@ -263,9 +275,13 @@ jobs: - run: | sudo apt update sudo apt install -y --no-install-recommends zstd - - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc - with: - cache-disable: true + # - uses: metatypedev/setup-ghjk@318209a9d215f70716a4ac89dbeb9653a2deb8bc + # with: + # cache-disable: true + - run: curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh | bash + - run: echo "~/.local/bin" >> $GITHUB_PATH + - run: ghjk envs cook + - shell: bash run: | # the big run