Skip to content

Commit 1540223

Browse files
committed
ci: update path to prevent collision
1 parent c4a713b commit 1540223

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/cd.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- {NAME: linux, OS: ubuntu-latest, ARCH: x86_64, PATH: target/optimized/bob, TARGET: ""}
2525
- {NAME: linux, OS: ubuntu-24.04-arm, ARCH: arm, PATH: target/optimized/bob, TARGET: ""}
2626
- {NAME: macos, OS: macos-latest, ARCH: x86_64, PATH: target/x86_64-apple-darwin/optimized/bob, TARGET: "x86_64-apple-darwin"}
27-
- {NAME: windows, OS: windows-latest, ARCH: x86_64, PATH: build, TARGET: ""}
27+
- {NAME: windows, OS: windows-latest, ARCH: x86_64, PATH: build_out, TARGET: ""}
2828
- {NAME: macos, OS: macos-latest, ARCH: arm, PATH: target/optimized/bob, TARGET: ""}
2929
tls:
3030
- {NAME: Rustls, SUFFIX: "", ARGS: ""}
@@ -69,10 +69,12 @@ jobs:
6969
if: matrix.os.NAME == 'linux' && matrix.tls.NAME == 'Rustls'
7070
run: "mkdir -p AppDir/usr/bin AppDir/usr/share/icons/hicolor/256x256/apps AppDir/usr/share/applications\ncp target/optimized/bob AppDir/usr/bin/\ncp resources/bob-icon.png AppDir/usr/share/icons/hicolor/256x256/apps/bob.png\ncat <<EOF > AppDir/bob.desktop\n[Desktop Entry]\nName=Bob Neovim Manager\nExec=bob\nIcon=bob\nType=Application\nCategories=Utility;Development;\nComment=A cross-platform Neovim version manager\nEOF\ncp AppDir/bob.desktop AppDir/usr/share/applications/\n\n# Verify the file exists right before linuxdeploy\nls -l AppDir/usr/bin/bob \n\nexport UPD_INFO=\"gh-releases-zsync|Matsuuu|bob|latest|bob-${{ matrix.os.ARCH }}.AppImage.zsync\"\nexport OUTPUT=\"bob-${{ matrix.os.ARCH }}${{ matrix.tls.SUFFIX }}.AppImage\"\n\n# Change --executable path to be relative to CWD\n./linuxdeploy --appdir AppDir --executable AppDir/usr/bin/bob --desktop-file AppDir/bob.desktop --icon-file AppDir/usr/share/icons/hicolor/256x256/apps/bob.png --output appimage\n"
7171
- name: "Setup Bob build directory"
72+
# env:
73+
# BUILD_OUTPUT: build_out
7274
run: |
73-
mkdir build
74-
copy .\\bin\\vcruntime140.dll .\\build
75-
copy .\\target\\optimized\\bob.exe .\\build
75+
mkdir ${{ matrix.os.PATH }}
76+
copy .\\bin\\vcruntime140.dll .\\${{ matrix.os.PATH }}
77+
copy .\\target\\optimized\\bob.exe ".\\${{ matrix.os.PATH }}"
7678
if: matrix.os.OS == 'windows-latest'
7779
- name: "Upload Bob binary"
7880
uses: actions/upload-artifact@v4

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- {NAME: linux, OS: ubuntu-latest, ARCH: x86_64, PATH: target/optimized/bob, TARGET: ""}
8888
- {NAME: linux, OS: ubuntu-24.04-arm, ARCH: arm, PATH: target/optimized/bob, TARGET: ""}
8989
- {NAME: macos, OS: macos-latest, ARCH: x86_64, PATH: target/x86_64-apple-darwin/optimized/bob, TARGET: "x86_64-apple-darwin"}
90-
- {NAME: windows, OS: windows-latest, ARCH: x86_64, PATH: build, TARGET: ""}
90+
- {NAME: windows, OS: windows-latest, ARCH: x86_64, PATH: build_out, TARGET: ""}
9191
- {NAME: macos, OS: macos-latest, ARCH: arm, PATH: target/optimized/bob, TARGET: ""}
9292
tls:
9393
- {NAME: Rustls, SUFFIX: "", ARGS: ""}
@@ -133,9 +133,9 @@ jobs:
133133
run: "mkdir -p AppDir/usr/bin AppDir/usr/share/icons/hicolor/256x256/apps AppDir/usr/share/applications\ncp target/optimized/bob AppDir/usr/bin/\ncp resources/bob-icon.png AppDir/usr/share/icons/hicolor/256x256/apps/bob.png\ncat <<EOF > AppDir/bob.desktop\n[Desktop Entry]\nName=Bob Neovim Manager\nExec=bob\nIcon=bob\nType=Application\nCategories=Utility;Development;\nComment=A cross-platform Neovim version manager\nEOF\ncp AppDir/bob.desktop AppDir/usr/share/applications/\n\n# Verify the file exists right before linuxdeploy\nls -l AppDir/usr/bin/bob \n\nexport UPD_INFO=\"gh-releases-zsync|Matsuuu|bob|latest|bob-${{ matrix.os.ARCH }}.AppImage.zsync\"\nexport OUTPUT=\"bob-${{ matrix.os.ARCH }}${{ matrix.tls.SUFFIX }}.AppImage\"\n\n# Change --executable path to be relative to CWD\n./linuxdeploy --appdir AppDir --executable AppDir/usr/bin/bob --desktop-file AppDir/bob.desktop --icon-file AppDir/usr/share/icons/hicolor/256x256/apps/bob.png --output appimage\n"
134134
- name: "Setup Bob build directory"
135135
run: |
136-
mkdir build
137-
copy .\\bin\\vcruntime140.dll .\\build
138-
copy .\\target\\optimized\\bob.exe .\\build
136+
mkdir ${{ matrix.os.PATH }}
137+
copy .\\bin\\vcruntime140.dll .\\${{ matrix.os.PATH }}
138+
copy .\\target\\optimized\\bob.exe ".\\${{ matrix.os.PATH }}"
139139
if: matrix.os.OS == 'windows-latest'
140140
- name: "Upload Bob binary"
141141
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)