Merge pull request #12 from jbw/fix-notification-text-layout

jbw · Nov 14, 2022 · bc34413 · bc34413
2 parents 565fa7d + 4cc6cef
commit bc34413
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,9 @@ on:
   push:
     branches: ["main", "beta"]
   pull_request:
-    branches: ["main", "beta"]
+    types:
+      - opened
+      - synchronize
 
 jobs:
   get-next-version:
@@ -28,7 +30,6 @@ jobs:
     needs: [get-next-version, lint]
     name: 🛠️ Build
     runs-on: macos-12
-    if: needs.get-next-version.outputs.new-release-published == 'true'
 
     steps:
       - name: Checkout
@@ -46,7 +47,7 @@ jobs:
           AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }}
           AUTH_SECRET: ${{ secrets.AUTH_SECRET }}
         run: |
-          export OCTOBLAST_VERSION=${{ needs.get-next-version.outputs.new-release-version }}
+          export OCTOBLAST_VERSION=${{ needs.get-next-version.outputs.new-release-version }} 
           ./releases/build.sh
 
       - name: Upload a Build Artifact

diff --git a/OctoBlast.xcodeproj/project.pbxproj b/OctoBlast.xcodeproj/project.pbxproj
@@ -577,8 +577,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin";
 			requirement = {
-				branch = main;
-				kind = branch;
+				minimumVersion = 4.2.0;
+				kind = upToNextMajorVersion;
 			};
 		};
 		71BC7E8A28CE3D7C00E1DFA6 /* XCRemoteSwiftPackageReference "Preferences" */ = {

diff --git a/releases/build.sh b/releases/build.sh
@@ -1,12 +1,14 @@
 set -e
 rm -rf build
 mkdir -p releases
-echo $OCTOBLAST_VERSION >OctoBlast/version.txt
-sed -i .bak 's/CURRENT_PROJECT_VERSION.*;/CURRENT_PROJECT_VERSION = '$OCTOBLAST_VERSION';/g' OctoBlast.xcodeproj/project.pbxproj
-sed -i .bak 's/MARKETING_VERSION.*;/MARKETING_VERSION = '$OCTOBLAST_VERSION';/g' OctoBlast.xcodeproj/project.pbxproj
+
+echo ${OCTOBLAST_VERSION:-1.0.0} >OctoBlast/version.txt
+cat OctoBlast/version.txt
+sed -i .bak 's/CURRENT_PROJECT_VERSION.*;/CURRENT_PROJECT_VERSION = '${OCTOBLAST_VERSION:-1.0.0}';/g' OctoBlast.xcodeproj/project.pbxproj
+sed -i .bak 's/MARKETING_VERSION.*;/MARKETING_VERSION = '${OCTOBLAST_VERSION:-1.0.0}';/g' OctoBlast.xcodeproj/project.pbxproj
 xcodebuild clean
 xcodebuild clean archive -scheme OctoBlast -configuration Release -archivePath build/OctoBlast.xcarchive
 xcodebuild -exportArchive -archivePath build/OctoBlast.xcarchive -exportPath build/OctoBlast -exportOptionsPlist OctoBlast/Info.plist
 
 cd build/OctoBlast/
-zip -r ../../releases/archives/OctoBlast-$OCTOBLAST_VERSION.zip OctoBlast.app
+zip -r ../../releases/archives/OctoBlast-${OCTOBLAST_VERSION:-1.0.0}.zip OctoBlast.app