@@ -37,93 +37,82 @@ jobs:
3737 ./gradlew :dgrv4_Gateway_serv:clean :dgrv4_Gateway_serv:bootJar
3838
3939 - name : Create release directory
40- run : mkdir -p $H2_PACKAGE_NAME/keys
40+ run : mkdir -p ${{ env. H2_PACKAGE_NAME }} /keys
4141
4242 - name : Copy JAR and other assets
4343 run : |
44- mv dgrv4_Gateway_serv/build/libs/* $H2_PACKAGE_NAME/
45- mv dgrv4_Gateway_serv/keys/* $H2_PACKAGE_NAME/keys/
46- mv $H2_PACKAGE_NAME/*.jar $H2_PACKAGE_NAME/digirunner.jar
44+ mv dgrv4_Gateway_serv/build/libs/* ${{ env. H2_PACKAGE_NAME }} /
45+ mv dgrv4_Gateway_serv/keys/* ${{ env. H2_PACKAGE_NAME }} /keys/
46+ mv ${{ env. H2_PACKAGE_NAME }} /*.jar ${{ env. H2_PACKAGE_NAME }} /digirunner.jar
4747
4848 - name : Download Windows amd64 TPIsoftwareOSPO quickstart portable
4949 uses : robinraju/release-downloader@v1
5050 with :
5151 repository : TPIsoftwareOSPO/quickstart
5252 tag : v${{ env.QUICKSTART_VERSION }}
53- fileName : " quickstart-portable_$QUICKSTART_VERSION_windows_amd64 .zip"
54- out-file-path : $DOWNLOADS_DIR
53+ fileName : " quickstart-portable_${{ env.QUICKSTART_VERSION }}_windows_amd64 .zip"
54+ out-file-path : ${{ env. DOWNLOADS_DIR }}
5555
5656 - name : Download Macos apple chip TPIsoftwareOSPO quickstart portable
5757 uses : robinraju/release-downloader@v1
5858 with :
5959 repository : TPIsoftwareOSPO/quickstart
6060 tag : v${{ env.QUICKSTART_VERSION }}
61- fileName : " quickstart-portable_$QUICKSTART_VERSION_darwin_arm64 .tar.gz"
62- out-file-path : $DOWNLOADS_DIR
61+ fileName : " quickstart-portable_$${{ env.QUICKSTART_VERSION }}_darwin_arm64 .tar.gz"
62+ out-file-path : ${{ env. DOWNLOADS_DIR }}
6363
6464 - name : Download Java 21 JRE from Azul Zulu
6565 run : |
6666 echo "Downloading Win Java JRE from: $WIN_JRE_URL"
67- curl -L -o $DOWNLOADS_DIR/win/java_jre.zip $WIN_JRE_URL
67+ curl -L -o ${{ env. DOWNLOADS_DIR }} /win/java_jre.zip $WIN_JRE_URL
6868 if [ $? -ne 0 ]; then
6969 echo "Error: Java JRE download failed from $WIN_JRE_URL"
7070 exit 1
7171 fi
7272 echo "Downloading Mac Java JRE from: $MAC_JRE_URL"
73- curl -L -o $DOWNLOADS_DIR/mac/java_jre.zip $MAC_JRE_URL
73+ curl -L -o ${{ env. DOWNLOADS_DIR }} /mac/java_jre.zip $MAC_JRE_URL
7474 if [ $? -ne 0 ]; then
7575 echo "Error: Java JRE download failed from $MAC_JRE_URL"
7676 exit 1
7777 fi
7878
7979 - name : Extract Java JRE packages
8080 run : |
81- unzip -q $DOWNLOADS_DIR/win/java_jre.zip -d $TEMP_DIR/win && rm $DOWNLOADS_DIR/win/java_jre.zip
82- unzip -q $DOWNLOADS_DIR/mac/java_jre.zip -d $TEMP_DIR/mac && rm $DOWNLOADS_DIR/mac/java_jre.zip
83- mv $TEMP_DIR/win/zulu21.42.19-ca-jre21.0.7-win_x64 $TEMP_DIR/win/jre
84- mv $TEMP_DIR/mac/zulu21.42.19-ca-jre21.0.7-macosx_aarch64 $TEMP_DIR/mac/jre
85- echo "ls -l $TEMP_DIR/win/jre"
86- ls -l $TEMP_DIR/win/jre
87- echo "ls -l $TEMP_DIR/mac/jre"
88- ls -l $TEMP_DIR/mac/jre
81+ unzip -q ${{ env. DOWNLOADS_DIR }} /win/java_jre.zip -d ${{ env. TEMP_DIR }} /win && rm ${{ env. DOWNLOADS_DIR }} /win/java_jre.zip
82+ unzip -q ${{ env. DOWNLOADS_DIR }} /mac/java_jre.zip -d ${{ env. TEMP_DIR }} /mac && rm ${{ env. DOWNLOADS_DIR }} /mac/java_jre.zip
83+ mv ${{ env. TEMP_DIR }} /win/zulu21.42.19-ca-jre21.0.7-win_x64 ${{ env. TEMP_DIR }} /win/jre
84+ mv ${{ env. TEMP_DIR }} /mac/zulu21.42.19-ca-jre21.0.7-macosx_aarch64 ${{ env. TEMP_DIR }} /mac/jre
85+ echo "ls -l ${{ env. TEMP_DIR }} /win/jre"
86+ ls -l ${{ env. TEMP_DIR }} /win/jre
87+ echo "ls -l ${{ env. TEMP_DIR }} /mac/jre"
88+ ls -l ${{ env. TEMP_DIR }} /mac/jre
8989
9090 - name : Packet Mac Portable
9191 run : |
92- mkdir $TAG_macos_arm6
93- tar -xzf quickstart-portable_$QUICKSTART_VERSION_darwin_arm64.tar.gz -C $TEMP_DIR/$TAG_macos_arm6/quickstart
94- mv $TEMP_DIR/$TAG_macos_arm6/quickstart/quickstart-portable $TAG_macos_arm6/quickstart
95- mv $TEMP_DIR/$TAG_macos_arm6/jre $TAG_macos_arm6
96- mv deploys/quickstart/quickstart-mac.yaml $TAG_macos_arm6/quickstart.yaml
97- cp -R $H2_PACKAGE_NAME/* $TAG_macos_arm6/digirunner
98-
92+ mkdir ${{ env.TAG }}_macos_arm6
93+ tar -xzf quickstart-portable_${{ env.QUICKSTART_VERSION }}_darwin_arm64.tar.gz -C ${{ env.TEMP_DIR }}/${{ env.TAG }}_macos_arm6/quickstart
94+ mv ${{ env.TEMP_DIR }}/${{ env.TAG }}_macos_arm6/quickstart/quickstart-portable ${{ env.TAG }}_macos_arm6/quickstart
95+ mv ${{ env.TEMP_DIR }}/${{ env.TAG }}_macos_arm6/jre ${{ env.TAG }}_macos_arm6
96+ mv deploys/quickstart/quickstart-mac.yaml ${{ env.TAG }}_macos_arm6/quickstart.yaml
97+ cp -R ${{ env.H2_PACKAGE_NAME }}/* ${{ env.TAG }}_macos_arm6/digirunner
9998
10099 - name : Zip release assets
101100 run : |
102- zip -r $H2_PACKAGE_NAME.zip $H2_PACKAGE_NAME/
103- mv mac $TAG_macos_arm64
104- zip -r $TAG_macos_arm64.zip $TAG_macos_arm6/
105-
106- # - name: Upload Release Asset
107- # uses: actions/upload-release-asset@v1.0.2
108- # env:
109- # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110- # with:
111- # upload_url: ${{ github.event.release.upload_url }}
112- # asset_path: $H2_PACKAGE_NAME.zip
113- # asset_name: $H2_PACKAGE_NAME.zip
114- # asset_content_type: application/zip
101+ zip -r ${{ env.H2_PACKAGE_NAME }}.zip ${{ env.H2_PACKAGE_NAME }}/
102+ mv mac ${{ env.TAG }}_macos_arm64
103+ zip -r ${{ env.TAG }}_macos_arm64.zip ${{ env.TAG }}_macos_arm6/
115104
116105 - name : Create GitHub Release and Upload Asset
117106 uses : softprops/action-gh-release@v2
118107 with :
119- tag_name : $TAG
120- name : digirunner portable packages $TAG
108+ tag_name : ${{ env. TAG }}
109+ name : digirunner portable packages ${{ env. TAG }}
121110 body : |
122111 Combined package generated from:
123- - digiRunner-Open-Source: $TAG
124- - TPIsoftwareOSPO/quickstart: $QUICKSTART_VERSION
112+ - digiRunner-Open-Source: ${{ env. TAG }}
113+ - TPIsoftwareOSPO/quickstart: ${{ env. QUICKSTART_VERSION }}
125114 files : |
126- $H2_PACKAGE_NAME.zip
115+ ${{ env. H2_PACKAGE_NAME }} .zip
127116 mac_arm64_${{ env.RELEASE_TAG }}.zip
128117 env :
129118 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
0 commit comments