Skip to content

Commit 16fe6bf

Browse files
committed
Fix various bugs in GHA workflows
1 parent 675c28c commit 16fe6bf

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/linux.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ jobs:
4242
package: PythonProcessor-linux
4343
run: |
4444
plugin_api=$(grep -rnw ../../plugin-GUI/Source -e '#define PLUGIN_API_VER' | grep -Eo "[0-9]*" | tail -1)
45-
tag=$(git describe --tags $(git rev-list --tags --max-count=1))
45+
tag=$(grep -w Source/OpenEphysLib.cpp -e 'info->libVersion' | grep -Eo "[0-9]+.[0-9]+.[0-9]+")
4646
new_plugin_ver=$tag-API$plugin_api
4747
mkdir plugins
4848
cp -r $build_dir/*.so plugins
49+
mv $build_dir/shared .
4950
zipfile=${package}_${new_plugin_ver}.zip
5051
echo "zipfile=${zipfile}" >> $GITHUB_ENV
51-
zip -r -X $zipfile plugins $build_dir/shared
52+
zip -r -X $zipfile plugins shared
5253
- uses: actions/upload-artifact@v3
5354
with:
5455
name: ${{ env.zipfile }}

.github/workflows/mac.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ jobs:
4343
new_plugin_ver=$tag-API$plugin_api
4444
mkdir plugins
4545
cp -r $build_dir/*.bundle plugins
46+
mv $build_dir/shared .
4647
zipfile=${package}_${new_plugin_ver}.zip
4748
echo "zipfile=${zipfile}" >> $GITHUB_ENV
48-
zip -r -X $zipfile plugins $build_dir/shared
49+
zip -r -X $zipfile plugins shared
4950
- uses: actions/upload-artifact@v3
5051
with:
5152
name: ${{ env.zipfile }}

.github/workflows/windows.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ jobs:
5959
new_plugin_ver=$tag-API$plugin_api
6060
mkdir plugins
6161
cp $build_dir/*.dll plugins
62+
mv $build_dir/shared .
6263
zipfile=${package}_${new_plugin_ver}.zip
6364
echo "zipfile=${zipfile}" >> $GITHUB_ENV
64-
powershell Compress-Archive -Path "plugins" -DestinationPath ${zipfile}}
65-
powershell Compress-Archive -U -Path "$build_dir/shared" -DestinationPath ${zipfile}
65+
powershell Compress-Archive -Path "plugins" -DestinationPath ${zipfile}
66+
powershell Compress-Archive -U -Path "shared" -DestinationPath ${zipfile}
6667
shell: bash
6768
- uses: actions/upload-artifact@v3
6869
with:

0 commit comments

Comments
 (0)