oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-15 17:26:58 +00:00
Code Wiki Activity

fix: Handle runner cargo bin path migration in timelord action

Browse source 
Runner images have migrated from /usr/share/rust/.cargo/bin to standard
~/.cargo/bin location. Action now checks old location first and migrates
binaries if found, maintaining compatibility with both paths.

Bump cache key to v3 to ensure fresh binary cache after path changes.
This commit is contained in:
Tom Foster 2025-09-15 16:17:32 +01:00
parent f872210b20
commit a120a4fa95
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.forgejo/actions/timelord/action.yml
View file

@ -27,7 +27,7 @@ runs:
echo "TIMELORD_KEY=${{ inputs.key || format('timelord-v1-{0}-{1}', github.repository, hashFiles('**/*.rs', '**/Cargo.toml', '**/Cargo.lock')) }}" >> $GITHUB_ENV echo "TIMELORD_KEY=${{ inputs.key || format('timelord-v1-{0}-{1}', github.repository, hashFiles('**/*.rs', '**/Cargo.toml', '**/Cargo.lock')) }}" >> $GITHUB_ENV
echo "TIMELORD_PATH=${{ inputs.path || '.' }}" >> $GITHUB_ENV echo "TIMELORD_PATH=${{ inputs.path || '.' }}" >> $GITHUB_ENV
echo "TIMELORD_CACHE_PATH=$HOME/.cache/timelord" >> $GITHUB_ENV echo "TIMELORD_CACHE_PATH=$HOME/.cache/timelord" >> $GITHUB_ENV
echo "PATH=/usr/share/rust/.cargo/bin:$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV echo "PATH=$HOME/.cargo/bin:/usr/share/rust/.cargo/bin:$PATH" >> $GITHUB_ENV
- name: Restore binary cache - name: Restore binary cache
id: binary-cache id: binary-cache
@ -36,21 +36,37 @@ runs:
path: | path: |
/usr/share/rust/.cargo/bin /usr/share/rust/.cargo/bin
~/.cargo/bin ~/.cargo/bin
key: timelord-binaries-v2 key: timelord-binaries-v3
- name: Check if binaries need installation - name: Check if binaries need installation
shell: bash shell: bash
id: check-binaries id: check-binaries
run: | run: |
NEED_INSTALL=false NEED_INSTALL=false
if [ ! -e /usr/share/rust/.cargo/bin/timelord ] && [ ! -e ~/.cargo/bin/timelord ]; then
echo "timelord-cli not found in /usr/share/rust/.cargo/bin or ~/.cargo/bin, needs installation" # Ensure ~/.cargo/bin exists
mkdir -p ~/.cargo/bin
# Check and move timelord if needed
if [ -f /usr/share/rust/.cargo/bin/timelord ] && [ ! -f ~/.cargo/bin/timelord ]; then
echo "Moving timelord from /usr/share/rust/.cargo/bin to ~/.cargo/bin"
mv /usr/share/rust/.cargo/bin/timelord ~/.cargo/bin/
fi
if [ ! -f ~/.cargo/bin/timelord ]; then
echo "timelord-cli not found, needs installation"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
if [ ! -e /usr/share/rust/.cargo/bin/git-warp-time ] && [ ! -e ~/.cargo/bin/git-warp-time ]; then
echo "git-warp-time not found in /usr/share/rust/.cargo/bin or ~/.cargo/bin, needs installation" # Check and move git-warp-time if needed
if [ -f /usr/share/rust/.cargo/bin/git-warp-time ] && [ ! -f ~/.cargo/bin/git-warp-time ]; then
echo "Moving git-warp-time from /usr/share/rust/.cargo/bin to ~/.cargo/bin"
mv /usr/share/rust/.cargo/bin/git-warp-time ~/.cargo/bin/
fi
if [ ! -f ~/.cargo/bin/git-warp-time ]; then
echo "git-warp-time not found, needs installation"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
echo "need-install=$NEED_INSTALL" >> $GITHUB_OUTPUT echo "need-install=$NEED_INSTALL" >> $GITHUB_OUTPUT
- name: Install timelord-cli and git-warp-time - name: Install timelord-cli and git-warp-time
@ -66,7 +82,7 @@ runs:
path: | path: |
/usr/share/rust/.cargo/bin /usr/share/rust/.cargo/bin
~/.cargo/bin ~/.cargo/bin
key: timelord-binaries-v2 key: timelord-binaries-v3
- name: Restore timelord cache with fallbacks - name: Restore timelord cache with fallbacks