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

Fix artifact names

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2023-02-12 22:33:40 +01:00
parent d71a277af7
commit d672ec05e9
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+2 -2
View File
@@ -64,12 +64,12 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: novelWriter-${{ env.VERSION }}-macos.app.zip name: novelWriter-${{ env.VERSION }}-macos.app.zip
path: dist_macos/novelWriter-${{ env.VERSION }}.app.zip path: dist_macos/novelWriter-${{ env.VERSION }}-macos.app.zip
retention-days: 1 retention-days: 1
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: novelWriter-${{ env.VERSION }}-macos.dmg name: novelWriter-${{ env.VERSION }}-macos.dmg
path: dist_macos/novelWriter-${{ env.VERSION }}.dmg path: dist_macos/novelWriter-${{ env.VERSION }}-macos.dmg
retention-days: 1 retention-days: 1
setup/macos/build.sh
-12
View File
@@ -38,7 +38,6 @@ else
echo "Missing: setup/macos/Info.plist" echo "Missing: setup/macos/Info.plist"
exit 1 exit 1
fi fi
echo ""
# Check that other assets are present # Check that other assets are present
echo "Checking assets" echo "Checking assets"
@@ -60,11 +59,9 @@ else
echo "Missing: novelwriter/assets/i18n/nw_en_US.qm" echo "Missing: novelwriter/assets/i18n/nw_en_US.qm"
exit 1 exit 1
fi fi
echo ""
echo "Content of current dir:" echo "Content of current dir:"
ls -lah . ls -lah .
echo ""
popd || exit 1 popd || exit 1
pushd "$BUILD_DIR"/ || exit 1 pushd "$BUILD_DIR"/ || exit 1
@@ -77,17 +74,14 @@ curl -LO https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
bash Miniconda3-latest-MacOSX-x86_64.sh -b -p ~/miniconda -f bash Miniconda3-latest-MacOSX-x86_64.sh -b -p ~/miniconda -f
rm Miniconda3-latest-MacOSX-x86_64.sh rm Miniconda3-latest-MacOSX-x86_64.sh
export PATH="$HOME/miniconda/bin:$PATH" export PATH="$HOME/miniconda/bin:$PATH"
echo ""
echo "Creating conda env ..." echo "Creating conda env ..."
# create conda env # create conda env
conda create -n novelWriter -c conda-forge python=3.10 --yes conda create -n novelWriter -c conda-forge python=3.10 --yes
source activate novelWriter source activate novelWriter
echo ""
echo "installing dictionaries ..." echo "installing dictionaries ..."
conda install -c conda-forge enchant hunspell-en --yes conda install -c conda-forge enchant hunspell-en --yes
echo ""
# Install dependencies # Install dependencies
echo "installing python dependencies ..." echo "installing python dependencies ..."
@@ -95,7 +89,6 @@ pip install -r "$SRC_DIR/requirements.txt"
# Leave conda env # Leave conda env
conda deactivate conda deactivate
echo ""
# --- Build App --------------------------------------------------------------------------------- # # --- Build App --------------------------------------------------------------------------------- #
@@ -104,7 +97,6 @@ echo "Building app bundle ..."
mkdir -p novelWriter.app/Contents/ mkdir -p novelWriter.app/Contents/
mkdir novelWriter.app/Contents/MacOS novelWriter.app/Contents/Resources novelWriter.app/Contents/Resources/novelWriter mkdir novelWriter.app/Contents/MacOS novelWriter.app/Contents/Resources novelWriter.app/Contents/Resources/novelWriter
cp $SRC_DIR/setup/macos/Info.plist novelWriter.app/Contents/Info.plist cp $SRC_DIR/setup/macos/Info.plist novelWriter.app/Contents/Info.plist
echo ""
echo "Copying miniconda env to bundle ..." echo "Copying miniconda env to bundle ..."
cp -R ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ cp -R ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/
@@ -122,7 +114,6 @@ for file in "${FILES_COPY[@]}"; do
done done
cp $SRC_DIR/setup/macos/novelwriter.icns novelWriter.app/Contents/Resources/ cp $SRC_DIR/setup/macos/novelwriter.icns novelWriter.app/Contents/Resources/
echo ""
# Create entry script # Create entry script
echo "Creating entry script ..." echo "Creating entry script ..."
@@ -134,7 +125,6 @@ EOF
# Make it executable # Make it executable
chmod a+x novelWriter.app/Contents/MacOS/novelWriter chmod a+x novelWriter.app/Contents/MacOS/novelWriter
echo ""
# Do codesigning # Do codesigning
# echo "Signing bundle ..." # echo "Signing bundle ..."
@@ -167,7 +157,6 @@ rm lib/python3.*/site-packages/PyQt5/Qt/lib/libQt5WebEngine* || true
popd || exit 1 popd || exit 1
popd || exit 1 popd || exit 1
echo ""
# --- Create App Bundle-------------------------------------------------------------------------- # # --- Create App Bundle-------------------------------------------------------------------------- #
@@ -179,7 +168,6 @@ zip -qr novelWriter.app.zip novelWriter.app
popd || exit 1 popd || exit 1
mv -v $BUILD_DIR/novelWriter.app.zip $RLS_DIR/novelWriter-"${VERSION}"-macos.app.zip mv -v $BUILD_DIR/novelWriter.app.zip $RLS_DIR/novelWriter-"${VERSION}"-macos.app.zip
echo ""
# --- Create DMG -------------------------------------------------------------------------------- # # --- Create DMG -------------------------------------------------------------------------------- #