From 218fa92f24172cae26b0c817b272c14576a3cea8 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Fri, 6 Jan 2023 09:14:19 +0000 Subject: [PATCH 1/7] Focus on OSX for now. --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b863433d..a1b0032f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [macos-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -48,7 +48,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [osx-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout From 1153cab9541c774db50ee901678de245e2541575 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Fri, 6 Jan 2023 09:14:29 +0000 Subject: [PATCH 2/7] Basic OSX packaging. --- .github/workflows/package/osx/action.yml | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/package/osx/action.yml diff --git a/.github/workflows/package/osx/action.yml b/.github/workflows/package/osx/action.yml new file mode 100644 index 00000000..dfa9fc3c --- /dev/null +++ b/.github/workflows/package/osx/action.yml @@ -0,0 +1,51 @@ +name: Package +description: Package OSX artifacts + +runs: + using: "composite" + steps: + + - name: Download Raw Build Artifacts + uses: actions/download-artifact@v3 + with: + name: osx-build + path: build + + - name: Install Prerequisites + shell: bash + run: | + pip3 install dmgbuild biplist + wget https://raw.githubusercontent.com/disorderedmaterials/scripts/master/prep-dmg + chmod u+x ./prep-dmg + + - name: Prepare DMG Dirs + shell: bash + run: | + set -ex + + ls -R build/ + Qt6_ROOT=./build/frontend/deploy + + # Get program version + export VERSION=`grep "#define JV2VERSION" version.h | sed "s/.*\"\(.*\)\"/\1/g"` + ./prep-dmg -a jv2 -v ${VERSION} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ${{ env.qtVersion }} -i extra/jv2_1024.png -p build/jv2.app/Contents/Info.plist + + - name: Create Images + shell: bash + run: | + set -ex + # Get program version + export VERSION=`grep "#define JV2VERSION" version.h | sed "s/.*\"\(.*\)\"/\1/g"` + # Create DMG + macdeployqt build/jv2.app + + - name: Rename Artifacts + shell: bash + run: | + set -ex + mkdir packages + mkdir packages/jv2 + mv dist/jv2Setup packages + mv dist/isisInternal packages + mv build/jv2.app packages/jv2 + zip jv2.zip packages From 3f8bcbf1b59cd5987461457582dc27280bd75667 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Mon, 16 Jan 2023 18:37:13 +0000 Subject: [PATCH 3/7] Get the runner OS right. --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a1b0032f..662266a9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -48,7 +48,7 @@ jobs: strategy: fail-fast: false matrix: - os: [osx-latest] + os: [macos-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout From 50851482f780818cdd661031df2cd63553863347 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Mon, 16 Jan 2023 21:05:45 +0000 Subject: [PATCH 4/7] Fix some bits. --- .github/workflows/package/osx/action.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/package/osx/action.yml b/.github/workflows/package/osx/action.yml index dfa9fc3c..ebf651a1 100644 --- a/.github/workflows/package/osx/action.yml +++ b/.github/workflows/package/osx/action.yml @@ -24,19 +24,13 @@ runs: set -ex ls -R build/ - Qt6_ROOT=./build/frontend/deploy - # Get program version - export VERSION=`grep "#define JV2VERSION" version.h | sed "s/.*\"\(.*\)\"/\1/g"` - ./prep-dmg -a jv2 -v ${VERSION} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ${{ env.qtVersion }} -i extra/jv2_1024.png -p build/jv2.app/Contents/Info.plist + ./prep-dmg -a jv2 -v ${{ env.jv2Version }} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ./build/frontend/deploy -i extra/jv2_1024.png -p build/jv2.app/Contents/Info.plist - name: Create Images shell: bash run: | set -ex - # Get program version - export VERSION=`grep "#define JV2VERSION" version.h | sed "s/.*\"\(.*\)\"/\1/g"` - # Create DMG macdeployqt build/jv2.app - name: Rename Artifacts From 4b310a08bfb8e54a3a3a361dae7f3ddef5a00650 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Tue, 17 Jan 2023 11:29:26 +0000 Subject: [PATCH 5/7] Path to plist. --- .github/workflows/package/osx/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package/osx/action.yml b/.github/workflows/package/osx/action.yml index ebf651a1..dd259b4f 100644 --- a/.github/workflows/package/osx/action.yml +++ b/.github/workflows/package/osx/action.yml @@ -25,7 +25,7 @@ runs: ls -R build/ - ./prep-dmg -a jv2 -v ${{ env.jv2Version }} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ./build/frontend/deploy -i extra/jv2_1024.png -p build/jv2.app/Contents/Info.plist + ./prep-dmg -a jv2 -v ${{ env.jv2Version }} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ./build/frontend/deploy -i extra/jv2_1024.png -p build/frontend/build/bin/jv2.app/Contents/Info.plist - name: Create Images shell: bash From 078c65ee83e325bc5960dbd0ec9dcd73fd9e8f76 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Thu, 26 Jan 2023 11:19:12 +0000 Subject: [PATCH 6/7] Fix path to deployed Qt. --- .github/workflows/package/osx/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package/osx/action.yml b/.github/workflows/package/osx/action.yml index dd259b4f..09837b8d 100644 --- a/.github/workflows/package/osx/action.yml +++ b/.github/workflows/package/osx/action.yml @@ -25,7 +25,7 @@ runs: ls -R build/ - ./prep-dmg -a jv2 -v ${{ env.jv2Version }} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ./build/frontend/deploy -i extra/jv2_1024.png -p build/frontend/build/bin/jv2.app/Contents/Info.plist + ./prep-dmg -a jv2 -v ${{ env.jv2Version }} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ./build/frontend/deploy/qt -i extra/jv2_1024.png -p build/frontend/build/bin/jv2.app/Contents/Info.plist - name: Create Images shell: bash From 54dcb8e2e272b1dc39863dab4382c98964ae4184 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Thu, 26 Jan 2023 15:22:13 +0000 Subject: [PATCH 7/7] More stuff. --- .github/workflows/package/osx/action.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/package/osx/action.yml b/.github/workflows/package/osx/action.yml index 09837b8d..ec9af93b 100644 --- a/.github/workflows/package/osx/action.yml +++ b/.github/workflows/package/osx/action.yml @@ -23,16 +23,12 @@ runs: run: | set -ex - ls -R build/ + # Make macdeployqt user rwx + ls -larth ./build/frontend/deploy/qt/bin/macdeployqt + chmod a+rwx ./build/frontend/deploy/qt/bin/macdeployqt ./prep-dmg -a jv2 -v ${{ env.jv2Version }} -b build/frontend/build/bin/jv2.app/Contents/MacOS/jv2 -d ./build/frontend/deploy/qt -i extra/jv2_1024.png -p build/frontend/build/bin/jv2.app/Contents/Info.plist - - name: Create Images - shell: bash - run: | - set -ex - macdeployqt build/jv2.app - - name: Rename Artifacts shell: bash run: |