Update GHA workflows

open-ephys-plugins · Jan 18, 2025 · 43b87c7 · 43b87c7
1 parent 5c744b0
commit 43b87c7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,8 +14,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
     - name: set env vars
       run: |
         if [ ${{github.ref_name}} == 'juce8' ]; then
@@ -43,7 +41,7 @@ jobs:
     - name: deploy
       if: github.ref == 'refs/heads/testing-juce8'
       env:
-        artifactoryApiKey: ${{ secrets.artifactoryApiKey }}
+        ARTIFACTORY_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
         build_dir: "Build"
         package: ZMQInterface-linux
       run: |
@@ -56,4 +54,4 @@ jobs:
         cp -r libs/linux/bin/* shared
         zipfile=${package}_${new_plugin_ver}.zip
         zip -r -X $zipfile plugins shared
-        curl -H "X-JFrog-Art-Api:$artifactoryApiKey" -T $zipfile "https://openephys.jfrog.io/artifactory/ZMQInterface-plugin/linux/$zipfile"
+        curl -H "X-JFrog-Art-Api:$ARTIFACTORY_ACCESS_TOKEN" -T $zipfile "https://openephys.jfrog.io/artifactory/ZMQInterface-plugin/linux/$zipfile"
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -44,7 +44,7 @@ jobs:
     - name: deploy
       if: github.ref == 'refs/heads/testing-juce8'
       env:
-        artifactoryApiKey: ${{ secrets.artifactoryApiKey }}
+        ARTIFACTORY_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
         MACOS_CERTIFICATE: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
         MACOS_CERTIFICATE_PWD: ${{ secrets.BUILD_CERTIFICATE_PWD }}
         MACOS_CERTIFICATE_NAME: ${{ secrets.BUILD_CERTIFICATE_NAME }}
@@ -111,6 +111,8 @@ jobs:
         spctl -vvv --assess --type exec plugins/zmq-interface.bundle
 
         zipfile=${package}_${new_plugin_ver}.zip
-        /usr/bin/ditto -c -k --sequesterRsrc --keepParent plugins $zipfile
-        /usr/bin/ditto -c -k --sequesterRsrc --keepParent shared $zipfile
-        curl -H "X-JFrog-Art-Api:$artifactoryApiKey" -T $zipfile "https://openephys.jfrog.io/artifactory/ZMQInterface-plugin/mac/$zipfile"
+        mkdir temp_dir
+        cp -R plugins shared temp_dir
+        /usr/bin/ditto -c -k --sequesterRsrc temp_dir $zipfile
+
+        curl -H "X-JFrog-Art-Api:$ARTIFACTORY_ACCESS_TOKEN" -T $zipfile "https://openephys.jfrog.io/artifactory/ZMQInterface-plugin/mac/$zipfile"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,8 +14,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
     - name: set env vars
       run: |
         if [ ${{github.ref_name}} == 'juce8' ]; then
@@ -36,7 +34,7 @@ jobs:
         cd plugin-GUI/Build
         cmake -G "Visual Studio 17 2022" -A x64 .. 
         mkdir Release && cd Release
-        curl -L https://openephysgui.jfrog.io/artifactory/Libraries/open-ephys-lib-$GUI_LIB_VERSION.zip --output open-ephys-lib.zip 
+        curl -L https://openephys.jfrog.io/artifactory/GUI-binaries/Libraries/open-ephys-lib-$GUI_LIB_VERSION.zip --output open-ephys-lib.zip
         unzip open-ephys-lib.zip
       shell: bash
     - name: configure
@@ -46,17 +44,18 @@ jobs:
       shell: bash
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2
-    - name: build
+    - name: build-plugin
       run: |
-        msbuild Build/INSTALL.vcxproj -p:Configuration=Release -p:Platform=x64
+        cd Build
+        msbuild INSTALL.vcxproj -p:Configuration=Release -p:Platform=x64
       shell: cmd
 # TODO: Perform some basic testing before publishing...
 #    - name: test
 #      run: cd build && ctest
     - name: deploy
       if: github.ref == 'refs/heads/testing-juce8'
       env:
-        artifactoryApiKey: ${{ secrets.artifactoryApiKey }}
+        ARTIFACTORY_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
         build_dir: "Build/Release"
         package: ZMQInterface-windows
       run: |
@@ -70,5 +69,5 @@ jobs:
         zipfile=${package}_${new_plugin_ver}.zip
         powershell Compress-Archive -Path "plugins" -DestinationPath ${zipfile}
         powershell Compress-Archive -U -Path "shared" -DestinationPath ${zipfile}
-        curl -H "X-JFrog-Art-Api:$artifactoryApiKey" -T $zipfile "https://openephys.jfrog.io/artifactory/ZMQInterface-plugin/windows/$zipfile"
+        curl -H "X-JFrog-Art-Api:$ARTIFACTORY_ACCESS_TOKEN" -T $zipfile "https://openephys.jfrog.io/artifactory/ZMQInterface-plugin/windows/$zipfile"
       shell: bash