Skip to content

Commit 06f1c8e

Browse files
authored
Remove librubyfmt caching from CI to fix ubuntu build (#479)
* Maybe caching is just busted * Just rip out the old caching mechanism
1 parent 7a4626f commit 06f1c8e

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ jobs:
8787
~/.cargo/registry
8888
~/.cargo/git
8989
key: ${{ runner.os }}-${{ matrix.target }}-cargo-2-${{ hashFiles('**/Cargo.lock') }}
90-
- uses: actions/cache@v4
91-
with:
92-
path: |
93-
librubyfmt/ruby_checkout
94-
key: ${{ runner.os }}-${{ matrix.target }}-ruby-v1-${{ hashFiles('.git/modules/librubyfmt/ruby_checkout/HEAD') }}
9590
- if: runner.os == 'macOS'
9691
run: |
9792
brew install automake bison

.github/workflows/preview-release.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ env:
1414
GEM_HOME: /tmp/.bundle
1515
GEM_PATH: /tmp/.bundle
1616
TERM: xterm256
17-
FORCE_FULL_RUBY_BUILD: 1
1817

1918
jobs:
2019
bump-tag:
@@ -64,11 +63,6 @@ jobs:
6463
override: true
6564
profile: minimal
6665
target: aarch64-unknown-linux-gnu
67-
- uses: actions/cache@v4
68-
with:
69-
path: |
70-
librubyfmt/ruby_checkout
71-
key: ${{ runner.os }}-${{matrix.target}}-ruby-v1-${{ hashFiles('.git/modules/librubyfmt/ruby_checkout/HEAD') }}
7266
- if: runner.os == 'macOS'
7367
run: |
7468
brew install automake bison

.github/workflows/release.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ jobs:
4343
override: true
4444
profile: minimal
4545
target: aarch64-unknown-linux-gnu
46-
- uses: actions/cache@v4
47-
with:
48-
path: |
49-
librubyfmt/ruby_checkout
50-
key: ${{ runner.os }}-${{matrix.target}}-ruby-v1-${{ hashFiles('.git/modules/librubyfmt/ruby_checkout/HEAD') }}
5146
- if: runner.os == 'macOS'
5247
run: |
5348
brew install automake bison

librubyfmt/build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ fn main() -> Output {
4747

4848
// Only rerun this build if the ruby_checkout has changed
4949
match old_checkout_sha {
50-
Some(old_sha)
51-
if old_sha == new_checkout_sha && env::var("FORCE_FULL_RUBY_BUILD").is_err() => {}
50+
Some(old_sha) if old_sha == new_checkout_sha => {}
5251
_ => {
5352
make_configure(&ruby_checkout_path)?;
5453
run_configure(&ruby_checkout_path)?;

0 commit comments

Comments
 (0)