Skip to content

Commit dea5f4f

Browse files
ErikUggeldahlErikUggeldahl
andcommitted
fix(Android): Unblock Android release flow (#12868) 77c82242bb
Commit `c8bb275d99` introduced a new Git attribute for an existing file without re-normalizing that file. This fixes the normalization issue while also making the Android release process more resilient to it recurring in the future. When the commit changed the expected git attributes for .bat files, the existing .bat file was left stored with line endings that did not match Git's normalized index expectations. This caused the runtime submodule to appear dirty, which then blocked Android releases because release-it requires a clean working tree. The release workflow is now more resilient on top of fixing the dirty status. Co-authored-by: Erik <erik@rive.app>
1 parent 1242226 commit dea5f4f

5 files changed

Lines changed: 12 additions & 2 deletions

File tree

.github/actions/prepare/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ inputs:
2525
runs:
2626
using: "composite"
2727
steps:
28+
- name: Ignore dirty runtime submodule worktree
29+
shell: bash
30+
run: git config --local submodule.submodules/rive-runtime.ignore dirty
31+
2832
- name: Configure AWS Credentials
2933
uses: aws-actions/configure-aws-credentials@v2
3034
with:

.github/actions/version-bump/action.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ inputs:
2121
runs:
2222
using: "composite"
2323
steps:
24+
- name: Ignore dirty runtime submodule worktree
25+
shell: bash
26+
run: git config --local submodule.submodules/rive-runtime.ignore dirty
2427
- name: Install dependencies
2528
shell: bash
2629
run: npm ci

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
submodules: true
2727
token: ${{ secrets.PAT_GITHUB }}
2828

29+
- name: Ignore dirty runtime submodule worktree
30+
run: git config --local submodule.submodules/rive-runtime.ignore dirty
31+
2932
- name: Configure AWS Credentials
3033
uses: aws-actions/configure-aws-credentials@v2
3134
with:

.rive_head

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4a612198f1804b82762988509502a5f5068b5e60
1+
77c82242bbcdf43f79461537117514e29b4f528c

0 commit comments

Comments
 (0)