update release to be manual

Author: gsabran

.github/workflows/main.yml

@@ -1,6 +1,3 @@
-# This workflow will build a Swift project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
-
 name: Integration tests
 
 on:

.github/workflows/release.yml

@@ -1,11 +1,6 @@
-# This workflow will build a Swift project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
-
 name: Release MacOS app
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request: # TODO: Remove
     branches: [ "main" ]
 concurrency:
@@ -31,11 +26,12 @@ jobs:
       run: cd local-server && yarn install
     - uses: actions/checkout@v4
     - name: Make release
-      run: cd app && fastlane mac distribute_release --verbose
+      run: cd app && fastlane mac distribute_release
       env:
         FASTLANE_MACH_REPO_GITHUB_ACCESS_TOKEN: ${{ secrets.FASTLANE_MACH_REPO_GITHUB_ACCESS_TOKEN }}
         MATCH_PASSWORD: ${{ secrets.FASTLANE_MACH_PASSWORD }}
         NOTARY_KEY_ID: ${{ secrets.NOTARY_KEY_ID }}
         NOTARY_P8: ${{ secrets.NOTARY_P8 }}
         NOTARY_ISSUER_ID: ${{ secrets.NOTARY_ISSUER_ID }}
         SPARKLE_SECRET_KEY: ${{ secrets.SPARKLE_SECRET_KEY }}
+        GH_WRITE_TOKEN: ${{ secrets.GH_WRITE_TOKEN }}

app/command.shared.xcconfig

@@ -6,7 +6,7 @@ RELEASE_SHARED_USER_DEFAULTS_SUITE = $(TeamIdentifierPrefix)dev.getcmd.shared
 
 INFOPLIST_KEY_ReleaseUserDefaultsSharedSuiteName = $(RELEASE_SHARED_USER_DEFAULTS_SUITE)
 INFOPLIST_KEY_DebugUserDefaultsSharedSuiteName = $(DEBUG_SHARED_USER_DEFAULTS_SUITE)
-APP_VERSION=0.0.31
+APP_VERSION=0.0.32
 MARKETING_VERSION=$(APP_VERSION)
 
 RELEASE_APP_BUNDLE_IDENTIFIER = dev.getcmd.command

app/command/Info.plist

@@ -11,7 +11,7 @@
 	<key>ReleaseUserDefaultsSharedSuiteName</key>
 	<string>$(INFOPLIST_KEY_ReleaseUserDefaultsSharedSuiteName)</string>
 	<key>SUFeedURL</key>
-	<string>https://raw.githubusercontent.com/gsabran/test/refs/heads/main/appcast.xml</string>
+	<string>https://raw.githubusercontent.com/getcmd-dev/cmd/refs/heads/main/appcast.xml</string>
 	<key>SUPublicEDKey</key>
 	<string>oIUy9brsbVznI5y2tOrX59KVITPCxYltusDhv4z9byE=</string>
 	<key>UserDefaultsSharedSuiteName</key>

app/fastlane/Fastfile

@@ -73,6 +73,7 @@ platform :mac do
   desc "Build, archive and sign the app for distribution"
   lane :create_and_sign_release do |options|
     remove_zip = options.fetch(:remove_zip, true)
+    version = options.fetch(:version, nil)
     setup_ci if ENV['CI']
 
     personal_github_access_token =  load_secret("FASTLANE_MACH_REPO_GITHUB_ACCESS_TOKEN")
@@ -167,11 +168,9 @@ platform :mac do
 
     sparkle_output = sh("echo '#{sparkle_secret_key}' | #{sparkle_path}/bin/sign_update #{app_zip_path} --ed-key-file -")
     app_config_path = File.absolute_path("../command.shared.xcconfig")
-    version = sh("cat #{app_config_path} | grep APP_VERSION=").split("APP_VERSION=").last.strip
-
-    puts "version: #{version}"
+    version = version || sh("cat #{app_config_path} | grep APP_VERSION=").split("APP_VERSION=").last.strip
 
-    puts "Notarization completed successfully. app_path: #{app_path}"
+    puts "Notarization completed successfully. version: #{version}, app_path: #{app_path}"
 
     appcast_template_path = File.absolute_path("./appcast.template.xml")
     appcast_path = File.absolute_path("./appcast.xml")
@@ -187,7 +186,23 @@ platform :mac do
 
   desc "Build, archive, sign and publish the app for distribution"
   lane :distribute_release do
-    result = create_and_sign_release(remove_zip: false)
+    app_config_path = File.absolute_path("../command.shared.xcconfig")
+    version = sh("cat #{app_config_path} | grep APP_VERSION=").split("APP_VERSION=").last.strip
+    # Look for an existing version tag. If one exist, bump the version.
+    existing_version = sh("git ls-remote origin refs/tags/v#{version}").strip
+    if existing_version.empty?
+      puts "Using version: #{version}"
+    else
+      version_parts = version.split('.')
+      version_parts[-1] = (version_parts[-1].to_i + 1).to_s
+      new_version = version_parts.join('.')
+      puts "Bumping version from #{version} to #{new_version}."
+
+      sh("sed -i '' 's/APP_VERSION=#{version}/APP_VERSION=#{new_version}/' #{app_config_path}")
+      version = new_version
+    end
+
+    result = create_and_sign_release(remove_zip: false, version: version)
     version = result[:version]
     app_zip_path = result[:app_zip_path]
     build_path = result[:build_path]
@@ -203,19 +218,13 @@ platform :mac do
       upload_assets: app_zip_path
     )
 
-    set_github_release(
-      api_token: load_secret("GITHUB_TEST_TOKEN"),
-      server_url: "https://api.github.com",
-      repository_name: "gsabran/test",
-      name: "v#{version}",
-      tag_name: "v#{version}",
-      description: "test release",
-      commitish: "main",
-      upload_assets: app_zip_path
-    )
-
     sh("rm -rf #{build_path}")
 
-    puts "👉 Don't forget to push the changes to appcast.xml"
+    create_pull_request(
+      api_token: load_secret("GH_WRITE_TOKEN"),
+      repo: "getcmd-dev/cmd",
+      title: "Release v#{version}",
+      base: "main"
+    )
   end
 end

app/fastlane/appcast.template.xml

@@ -15,7 +15,7 @@
           ]]>
         </description>
         <pubDate>Tue, 29 Mar 2022 15:20:11 +0000</pubDate>
-        <enclosure url="https://github.com/gsabran/test/releases/download/vREPLACE_SPARKLE_VERSION/command.app.zip" REPLACE_SPARKLE_SIGN_UPDATE />
+        <enclosure url="https://github.com/getcmd-dev/cmd/releases/download/vREPLACE_SPARKLE_VERSION/command.app.zip" REPLACE_SPARKLE_SIGN_UPDATE />
       </item>
   </channel>
 </rss>

app/fastlane/appcast.xml

@@ -16,7 +16,7 @@ new line
           ]]>
         </description>
         <pubDate>Tue, 29 Mar 2022 15:20:11 +0000</pubDate>
-        <enclosure url="https://github.com/gsabran/test/releases/download/v0.0.31/command.app.zip" sparkle:edSignature="LLqCu7OZCczUSt1nIebS3fOvG7oyu2FBwaXkFsyNWXgNLR76IpIRtnGGu+VhAc6F8FtR+bbF3x+dTHfv/pQvCQ==" length="26684595"
+        <enclosure url="https://github.com/getcmd-dev/cmd/releases/download/v0.0.31/command.app.zip" sparkle:edSignature="LLqCu7OZCczUSt1nIebS3fOvG7oyu2FBwaXkFsyNWXgNLR76IpIRtnGGu+VhAc6F8FtR+bbF3x+dTHfv/pQvCQ==" length="26684595"
  />
       </item>
   </channel>