From 74ead29433aedbe5170f900c16fc33669f97dd82 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 19:33:04 +0100 Subject: [PATCH 1/9] Move MacOS plist info back to a template file, and simplify stuff in setup.py --- .gitignore | 1 + setup.py | 113 ++++---------------------------- setup/macos/App.entitlements | 2 +- setup/macos/Info.plist.template | 62 ++++++++++++++++++ 4 files changed, 78 insertions(+), 100 deletions(-) create mode 100644 setup/macos/Info.plist.template diff --git a/.gitignore b/.gitignore index e12c3f96..20079fdc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ setup.iss /novelwriter.desktop /novelWriter.pyw +/setup/macos/Info.plist # Translations /novelwriter/assets/i18n/*.qm diff --git a/setup.py b/setup.py index 574096ef..b54f3797 100755 --- a/setup.py +++ b/setup.py @@ -71,25 +71,6 @@ def extractVersion(): return numVers, hexVers, relDate -def extractCopyright(): - """Extract the novelWriter copyright notice without having to import - anything else from the main package. - """ - copyright = "Unknown" - initFile = os.path.join("novelwriter", "__init__.py") - try: - with open(initFile, mode="r", encoding="utf-8") as inFile: - for aLine in inFile: - if aLine.startswith("__copyright__"): - copyright = (aLine).partition("=")[2].strip().strip('"') - except Exception as exc: - print("Could not read file: %s" % initFile) - print(str(exc)) - - print("novelWriter copyright: %s " % (copyright)) - - return copyright - def compactVersion(numVers): """Make the version number more compact.""" @@ -414,102 +395,36 @@ def buildQtI18nTS(sysArgs): return + ## # Generage MacOS PList ## def genMacOSPlist(): - - # Set Up Folder - # ============= - + """Set necessary values for .plist file. + """ numVers, _, _ = extractVersion() pkgVers = compactVersion(numVers) - outDir = "setup/macos" - macosBundleName = "novelWriter" - macosBundleExeName = "novelWriter" - macosBundleInfo = "novelWriter: A markdown-like text editor for planning and writing novels." - macosBundleIcon = "novelwriter.icns" - macosBundleIdent = "io.novelwriter.novelWriter" - macosBundleSVers = pkgVers - macosBundleVers = numVers - macosBundleCopyright = extractCopyright() + copyrightYear = datetime.datetime.now().year # These keys are no longer used but are present for compatability - macosBundleVersMajor, macosBundleVersMinor, _ = pkgVers.split(".") + pkgVersMaj, pkgVersMin, _ = pkgVers.split(".") - - plistXML = ( - "\n" - "\n" - "\n" - "\n" - "NSPrincipalClass\n" - "NSApplication\n" - "NSHighResolutionCapable\n" - "True\n" - "CFBundleDevelopmentRegion\n" - "English\n" - "CFBundleExecutable\n" - f"{macosBundleExeName}\n" - "CFBundleGetInfoString\n" - f"{macosBundleInfo}\n" - "CFBundleIconFile\n" - f"{macosBundleIcon}\n" - "CFBundleIdentifier\n" - f"{macosBundleIdent}\n" - "CFBundleName\n" - f"{macosBundleName}\n" - "CFBundleDisplayName\n" - f"{macosBundleName}\n" - "CFBundleInfoDictionaryVersion\n" - "6.0\n" - "CFBundleShortVersionString\n" - f"{macosBundleSVers}\n" - "CFBundleSignature\n" - "????\n" - "CFBundleVersion\n" - f"{macosBundleVers}\n" - "CFBundlePackageType\n" - "APPL\n" - "NSHumanReadableCopyright\n" - f"{macosBundleCopyright}\n" - "IFMajorVersion\n" - f"{macosBundleVersMajor}\n" - "IFMinorVersion\n" - f"{macosBundleVersMinor}\n" - "CFBundleDocumentTypes\n" - " \n" - " \n" - " CFBundleTypeExtensions\n" - " \n" - " nwx\n" - " \n" - " CFBundleTypeName\n" - " novelWriter Project\n" - " CFBundleTypeOSTypes\n" - " \n" - " TEXT\n" - " utxt\n" - " TUTX\n" - " ****\n" - " \n" - " CFBundleTypeRole\n" - " Viewer\n" - " LSHandlerRank\n" - " Alternate\n" - " \n" - " \n" - "\n" - "\n" + plistXML = readFile(f"{outDir}/Info.plist.template").format( + macosBundleSVers=pkgVers, + macosBundleVers=numVers, + macosBundleVersMajor=pkgVersMaj, + macosBundleVersMinor=pkgVersMin, + macosBundleCopyright=f"Copyright 2018–{copyrightYear}, Veronica Berglyd Olsen", ) print(f"Writing Info.plist to {outDir}/Info.plist") - writeFile(f"{outDir}/Info.plist", plistXML) + return + ## # Sample Project ZIP File Builder (sample) @@ -2059,7 +1974,7 @@ if __name__ == "__main__": if "clean-assets" in sys.argv: sys.argv.remove("clean-assets") cleanBuiltAssets() - + if "gen-plist" in sys.argv: sys.argv.remove("gen-plist") genMacOSPlist() diff --git a/setup/macos/App.entitlements b/setup/macos/App.entitlements index 40dc976a..8274a218 100644 --- a/setup/macos/App.entitlements +++ b/setup/macos/App.entitlements @@ -7,4 +7,4 @@ com.apple.security.cs.allow-dyld-environment-variables - \ No newline at end of file + diff --git a/setup/macos/Info.plist.template b/setup/macos/Info.plist.template new file mode 100644 index 00000000..d239a050 --- /dev/null +++ b/setup/macos/Info.plist.template @@ -0,0 +1,62 @@ + + + + + NSPrincipalClass + NSApplication + NSHighResolutionCapable + True + CFBundleDevelopmentRegion + English + CFBundleExecutable + novelWriter + CFBundleGetInfoString + novelWriter: A markdown-like text editor for planning and writing novels. + CFBundleIconFile + novelwriter.icns + CFBundleIdentifier + io.novelwriter.novelWriter + CFBundleName + novelWriter + CFBundleDisplayName + novelWriter + CFBundleInfoDictionaryVersion + 6.0 + CFBundleShortVersionString + {macosBundleSVers} + CFBundleSignature + ???? + CFBundleVersion + {macosBundleVers} + CFBundlePackageType + APPL + NSHumanReadableCopyright + {macosBundleCopyright} + IFMajorVersion + {macosBundleVersMajor} + IFMinorVersion + {macosBundleVersMinor} + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + nwx + + CFBundleTypeName + novelWriter Project + CFBundleTypeOSTypes + + TEXT + utxt + TUTX + **** + + CFBundleTypeRole + Viewer + LSHandlerRank + Alternate + + + + From 0e529fd72f549494e15e7be216f7b506c23e1090 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 19:33:12 +0100 Subject: [PATCH 2/9] Rewrite macOS build workflow and make some changes to build script --- .github/workflows/build.yml | 98 ------------------------------- .github/workflows/build_macos.yml | 81 +++++++++++++++++++++++++ setup/macos/build.sh | 32 +++++++++- 3 files changed, 110 insertions(+), 101 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/build_macos.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 70b32e66..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,98 +0,0 @@ -name: Build - -on: - push: - tags: - - '*' - -jobs: - build: - strategy: - fail-fast: false - matrix: - include: - - os: macos-12 - name: macos - qt_ver: 5 - qt_host: mac - qt_version: '5.15.2' - qt_modules: '' - qt_tools: '' - - runs-on: ${{ matrix.os }} - - steps: - ## - # PREPARE - ## - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: 'true' - - - name: Set short version - shell: bash - run: | - ver_short=`git rev-parse --short HEAD` - ver_novelwriter=`awk '/^__version__/{print substr($NF,2,length($NF)-2)}' novelwriter/__init__.py` - echo "VERSION=$ver_novelwriter" >> $GITHUB_ENV - echo "VERSION_SHORT=$ver_short" >> $GITHUB_ENV - - - name: Install Qt (Linux) - if: runner.os == 'Linux' && matrix.qt_ver != 6 - run: | - sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 - - - name: Install Qt (macOS, AppImage & Windows MSVC) - if: runner.os == 'Linux' && matrix.qt_ver == 6 || runner.os == 'macOS' || (runner.os == 'Windows' && matrix.msystem == '') - uses: jurplel/install-qt-action@v3 - with: - version: ${{ matrix.qt_version }} - host: ${{ matrix.qt_host }} - target: 'desktop' - arch: ${{ matrix.qt_arch }} - modules: ${{ matrix.qt_modules }} - tools: ${{ matrix.qt_tools }} - cache: true - - - name: Setup TeX Live - uses: teatimeguest/setup-texlive-action@v2 - with: - packages: >- - scheme-basic - collection-latexextra - latexmk - tex-gyre - - - name: Install Dependencies (macOS) - if: runner.os == 'macOS' - run: | - pip3 install sphinx - - ## - # BUILD - ## - - - name: Build (macOS) - if: runner.os == 'macOS' - run: | - ./setup/macos/build.sh - - ## - # UPLOAD BUILDS - ## - - - name: Upload binary zip (macOS) - if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 - with: - name: novelWriter-${{ env.VERSION }}-${{ matrix.name }}.app.zip - path: dist_macos/novelWriter-${{ env.VERSION }}.app.zip - - - name: Upload dmg (macOS) - if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 - with: - name: novelWriter-${{ env.VERSION }}-${{ matrix.name }}.dmg - path: dist_macos/novelWriter-${{ env.VERSION }}.dmg - diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml new file mode 100644 index 00000000..2f40f0f9 --- /dev/null +++ b/.github/workflows/build_macos.yml @@ -0,0 +1,81 @@ +name: Packaging + +on: + push: + tags: + - "*" + pull_request: + branches: + - patch + +jobs: + buildAssets: + runs-on: ubuntu-latest + steps: + - name: Python Setup + uses: actions/setup-python@v4 + with: + python-version: 3 + architecture: x64 + + - name: Install Packages (apt) + run: | + sudo apt update + sudo apt install qttools5-dev-tools python3-sphinx latexmk texlive texlive-latex-extra + + - name: Checkout Source + uses: actions/checkout@v3 + + - name: Run Build Commands + run: python setup.py qtlrelease sample manual + + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: nw-assets-${{ github.sha }} + path: | + novelwriter/assets/sample.zip + novelwriter/assets/manual.pdf + novelwriter/assets/i18n/*.qm + if-no-files-found: error + retention-days: 1 + + buildMac: + needs: buildAssets + strategy: + fail-fast: false + runs-on: macos-12 + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Get Version + shell: bash + run: | + NW_VERSION=`awk '/^__version__/{print substr($NF,2,length($NF)-2)}' novelwriter/__init__.py` + echo "novelWriter Version: $NW_VERSION" + echo "VERSION=$NW_VERSION" >> $GITHUB_ENV + + - name: Download Artifact + uses: actions/download-artifact@v3 + with: + name: nw-assets-${{ github.sha }} + path: novelwriter/assets + + - name: Build + run: | + ./setup/macos/build.sh + + - name: Upload ZIP + uses: actions/upload-artifact@v3 + with: + name: novelWriter-${{ env.VERSION }}-macos.app.zip + path: dist_macos/novelWriter-${{ env.VERSION }}.app.zip + retention-days: 1 + + - name: Upload DMG + uses: actions/upload-artifact@v3 + with: + name: novelWriter-${{ env.VERSION }}-macos.dmg + path: dist_macos/novelWriter-${{ env.VERSION }}.dmg + retention-days: 1 diff --git a/setup/macos/build.sh b/setup/macos/build.sh index 96e261c3..29a73e57 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -33,7 +33,33 @@ VERSION="$(awk '/^__version__/{print substr($NF,2,length($NF)-2)}' $SRC_DIR/nove pushd "$SRC_DIR" || exit 1 -python3 setup.py manual qtlrelease sample gen-plist +python3 setup.py gen-plist +if [ -f $SRC_DIR/setup/macos/Info.plist ]; then + echo "Found: setup/macos/Info.plist" +else + echo "Missing: setup/macos/Info.plist" + exit 1 +fi + +# Check that other assets are present +if [ -f $SRC_DIR/novelwriter/assets/sample.zip ]; then + echo "Found: novelwriter/assets/sample.zip" +else + echo "Missing: novelwriter/assets/sample.zip" + exit 1 +fi +if [ -f $SRC_DIR/novelwriter/assets/manual.pdf ]; then + echo "Found: novelwriter/assets/manual.pdf" +else + echo "Missing: novelwriter/assets/manual.pdf" + exit 1 +fi +if [ -f $SRC_DIR/novelwriter/assets/i18n/nw_en_US.qm ]; then + echo "Found: novelwriter/assets/i18n/nw_en_US.qm" +else + echo "Missing: novelwriter/assets/i18n/nw_en_US.qm" + exit 1 +fi ls -lah . @@ -78,7 +104,7 @@ echo "Copying novelWriter to bundle ..." FILES_COPY=( "CHANGELOG.md" "MANIFEST.in" "CREDITS.md" "LICENSE.md" - "CONTRIBUTING.md" "CODE_OF_CONDUCT.md" "i18n" "novelwriter" + "CONTRIBUTING.md" "CODE_OF_CONDUCT.md" "novelwriter" "novelWriter.py" ) @@ -114,7 +140,7 @@ rm -rf pkgs rm -rf cmake rm -rf share/{gtk-,}doc -#remove web engine +# remove web engine rm lib/python3.*/site-packages/PyQt5/QtWebEngine* || true rm -r lib/python3.*/site-packages/PyQt5/Qt/translations/qtwebengine* || true rm lib/python3.*/site-packages/PyQt5/Qt/resources/qtwebengine* || true From 8a5ff3ab852bffeb491d2cd8440ba1db01338c8a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 19:47:10 +0100 Subject: [PATCH 3/9] Turn off short retention time for now --- .github/workflows/build_macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 2f40f0f9..b7a2f5e9 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -71,11 +71,11 @@ jobs: with: name: novelWriter-${{ env.VERSION }}-macos.app.zip path: dist_macos/novelWriter-${{ env.VERSION }}.app.zip - retention-days: 1 + # retention-days: 1 - name: Upload DMG uses: actions/upload-artifact@v3 with: name: novelWriter-${{ env.VERSION }}-macos.dmg path: dist_macos/novelWriter-${{ env.VERSION }}.dmg - retention-days: 1 + # retention-days: 1 From b4813f904a6b1ceb8479dc9f2366729086981e4c Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 20:45:15 +0100 Subject: [PATCH 4/9] Try the preserve symlinks flag in mac bundle build --- setup/macos/build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup/macos/build.sh b/setup/macos/build.sh index 29a73e57..dce6b6e3 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -96,12 +96,9 @@ mkdir novelWriter.app/Contents/MacOS novelWriter.app/Contents/Resources novelWri cp $SRC_DIR/setup/macos/Info.plist novelWriter.app/Contents/Info.plist echo "Copying miniconda env to bundle ..." -# copy Miniconda env -cp -R ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ +cp -R --preserve=links ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ echo "Copying novelWriter to bundle ..." -# copy novelWriter - FILES_COPY=( "CHANGELOG.md" "MANIFEST.in" "CREDITS.md" "LICENSE.md" "CONTRIBUTING.md" "CODE_OF_CONDUCT.md" "novelwriter" From 44f624faf41aa5f56b976bb9179073a5f32846ec Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 20:54:51 +0100 Subject: [PATCH 5/9] Try the -a option instead --- setup/macos/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/macos/build.sh b/setup/macos/build.sh index dce6b6e3..30770bb4 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -96,7 +96,7 @@ mkdir novelWriter.app/Contents/MacOS novelWriter.app/Contents/Resources novelWri cp $SRC_DIR/setup/macos/Info.plist novelWriter.app/Contents/Info.plist echo "Copying miniconda env to bundle ..." -cp -R --preserve=links ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ +cp -a ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ echo "Copying novelWriter to bundle ..." FILES_COPY=( From cc48f8f8aa067483c64db88d73cdb2f94d544c66 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 22:27:16 +0100 Subject: [PATCH 6/9] Try removeing the python3.1 folder --- setup/macos/build.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/setup/macos/build.sh b/setup/macos/build.sh index 30770bb4..743be05a 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -137,14 +137,17 @@ rm -rf pkgs rm -rf cmake rm -rf share/{gtk-,}doc +# Remove the files from the 3.1 symlink +rm -rf lib/python3.1 + # remove web engine -rm lib/python3.*/site-packages/PyQt5/QtWebEngine* || true -rm -r lib/python3.*/site-packages/PyQt5/Qt/translations/qtwebengine* || true -rm lib/python3.*/site-packages/PyQt5/Qt/resources/qtwebengine* || true -rm -r lib/python3.*/site-packages/PyQt5/Qt/qml/QtWebEngine* || true -rm -r lib/python3.*/site-packages/PyQt5/Qt/plugins/webview/libqtwebview* || true -rm lib/python3.*/site-packages/PyQt5/Qt/libexec/QtWebEngineProcess* || true -rm lib/python3.*/site-packages/PyQt5/Qt/lib/libQt5WebEngine* || true +rm lib/python3.10/site-packages/PyQt5/QtWebEngine* || true +rm -r lib/python3.10/site-packages/PyQt5/Qt/translations/qtwebengine* || true +rm lib/python3.10/site-packages/PyQt5/Qt/resources/qtwebengine* || true +rm -r lib/python3.10/site-packages/PyQt5/Qt/qml/QtWebEngine* || true +rm -r lib/python3.10/site-packages/PyQt5/Qt/plugins/webview/libqtwebview* || true +rm lib/python3.10/site-packages/PyQt5/Qt/libexec/QtWebEngineProcess* || true +rm lib/python3.10/site-packages/PyQt5/Qt/lib/libQt5WebEngine* || true popd || exit 1 popd || exit 1 From 1d90ab9fc12413d16a71fb54d4499dc8e180ad85 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 23:12:14 +0100 Subject: [PATCH 7/9] Reverting som changes that didn't matter --- setup/macos/build.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup/macos/build.sh b/setup/macos/build.sh index 743be05a..e3e8e2ff 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -96,7 +96,7 @@ mkdir novelWriter.app/Contents/MacOS novelWriter.app/Contents/Resources novelWri cp $SRC_DIR/setup/macos/Info.plist novelWriter.app/Contents/Info.plist echo "Copying miniconda env to bundle ..." -cp -a ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ +cp -R ~/miniconda/envs/novelWriter/* novelWriter.app/Contents/Resources/ echo "Copying novelWriter to bundle ..." FILES_COPY=( @@ -141,13 +141,13 @@ rm -rf share/{gtk-,}doc rm -rf lib/python3.1 # remove web engine -rm lib/python3.10/site-packages/PyQt5/QtWebEngine* || true -rm -r lib/python3.10/site-packages/PyQt5/Qt/translations/qtwebengine* || true -rm lib/python3.10/site-packages/PyQt5/Qt/resources/qtwebengine* || true -rm -r lib/python3.10/site-packages/PyQt5/Qt/qml/QtWebEngine* || true -rm -r lib/python3.10/site-packages/PyQt5/Qt/plugins/webview/libqtwebview* || true -rm lib/python3.10/site-packages/PyQt5/Qt/libexec/QtWebEngineProcess* || true -rm lib/python3.10/site-packages/PyQt5/Qt/lib/libQt5WebEngine* || true +rm lib/python3.*/site-packages/PyQt5/QtWebEngine* || true +rm -r lib/python3.*/site-packages/PyQt5/Qt/translations/qtwebengine* || true +rm lib/python3.*/site-packages/PyQt5/Qt/resources/qtwebengine* || true +rm -r lib/python3.*/site-packages/PyQt5/Qt/qml/QtWebEngine* || true +rm -r lib/python3.*/site-packages/PyQt5/Qt/plugins/webview/libqtwebview* || true +rm lib/python3.*/site-packages/PyQt5/Qt/libexec/QtWebEngineProcess* || true +rm lib/python3.*/site-packages/PyQt5/Qt/lib/libQt5WebEngine* || true popd || exit 1 popd || exit 1 From 652ce3848bce2f2f95062844679cf345b5d6bc94 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 23:34:00 +0100 Subject: [PATCH 8/9] Try out using environment in workflow --- .github/workflows/build_macos.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index b7a2f5e9..bfa44366 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -2,15 +2,18 @@ name: Packaging on: push: - tags: - - "*" + branches: + - main + - patch pull_request: branches: + - main - patch jobs: buildAssets: runs-on: ubuntu-latest + environment: Release steps: - name: Python Setup uses: actions/setup-python@v4 @@ -45,6 +48,7 @@ jobs: strategy: fail-fast: false runs-on: macos-12 + environment: Release steps: - name: Checkout uses: actions/checkout@v3 From 6b1183392fd8e9e3185b051ff99d73acb31dc0e2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 4 Feb 2023 23:44:03 +0100 Subject: [PATCH 9/9] Try using workflow_dispatch instead --- .github/workflows/build_macos.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index bfa44366..afeb6966 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -1,19 +1,10 @@ name: Packaging -on: - push: - branches: - - main - - patch - pull_request: - branches: - - main - - patch +on: workflow_dispatch jobs: buildAssets: runs-on: ubuntu-latest - environment: Release steps: - name: Python Setup uses: actions/setup-python@v4 @@ -48,7 +39,6 @@ jobs: strategy: fail-fast: false runs-on: macos-12 - environment: Release steps: - name: Checkout uses: actions/checkout@v3