Skip to content

Commit

Permalink
fix: avoid use of setup-ghjk
Browse files Browse the repository at this point in the history
  • Loading branch information
Yohe-Am committed Dec 16, 2024
1 parent 8fb0f67 commit 15d7cbe
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 14 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/publish-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 20 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ jobs:
- uses: WyriHaximus/[email protected]
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)
Expand Down Expand Up @@ -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/[email protected]
id: latest-tag
- uses: dsherret/rust-toolchain-file@v1
Expand Down Expand Up @@ -172,7 +180,11 @@ jobs:
id: latest-tag
- uses: dsherret/rust-toolchain-file@v1
- uses: mozilla-actions/[email protected]
- 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 }}
Expand Down Expand Up @@ -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
Expand Down
34 changes: 25 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ jobs:
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
uses: mozilla-actions/[email protected]
- 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
Expand Down Expand Up @@ -131,10 +135,14 @@ jobs:
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
uses: mozilla-actions/[email protected]
- 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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 15d7cbe

Please sign in to comment.