Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make some tweaks to build scripts

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-20 18:02:10 +02:00
parent 885974a84e
commit 621e933f63
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+12 -4
View File
@@ -48,7 +48,7 @@ jobs:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with:
python-version: "3.12" python-version: "3.11"
architecture: x64 architecture: x64
- name: Install Packages (pip) - name: Install Packages (pip)
@@ -76,7 +76,11 @@ jobs:
buildMac-AMD64: buildMac-AMD64:
needs: buildAssets needs: buildAssets
runs-on: macos-12 runs-on: macos-13
env:
PYTHON_VERSION: "3.12"
ARCHITECTURE: amd64
MINICONDA_ARCH: x86_64
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -88,7 +92,7 @@ jobs:
path: novelwriter/assets path: novelwriter/assets
- name: Build App Bundle - name: Build App Bundle
run: ./setup/macos/build.sh amd64 run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@@ -101,6 +105,10 @@ jobs:
buildMac-M1: buildMac-M1:
needs: buildAssets needs: buildAssets
runs-on: macos-14 runs-on: macos-14
env:
PYTHON_VERSION: "3.12"
ARCHITECTURE: arm64
MINICONDA_ARCH: arm64
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -112,7 +120,7 @@ jobs:
path: novelwriter/assets path: novelwriter/assets
- name: Build App Bundle - name: Build App Bundle
run: ./setup/macos/build.sh arm64 run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
setup/macos/build.sh
+11 -5
View File
@@ -1,15 +1,21 @@
#! /bin/bash #! /bin/bash
if [ -z "$1"]; then if [ -z "$1"]; then
ARCH="amd64" PYTHON="3.11"
else else
ARCH="$1" PYTHON="$1"
fi fi
if [ $ARCH == "amd64 "]; then if [ -z "$2"]; then
ARCH="amd64"
else
ARCH="$2"
fi
if [ -z "$3"]; then
CONDA="x86_64" CONDA="x86_64"
else else
CONDA="$ARCH" CONDA="$3"
fi fi
# Use RAM disk if possible # Use RAM disk if possible
@@ -94,7 +100,7 @@ rm Miniconda3-latest-MacOSX-$CONDA.sh
export PATH="$HOME/miniconda/bin:$PATH" export PATH="$HOME/miniconda/bin:$PATH"
echo "Creating Conda env ..." echo "Creating Conda env ..."
conda create -n novelWriter -c conda-forge python=3.11 --yes conda create -n novelWriter -c conda-forge python=$PYTHON --yes
source activate novelWriter source activate novelWriter
echo "Installing dictionaries ..." echo "Installing dictionaries ..."