From 1c2582ba995e1e716ed2be7f1dbd015fa710f175 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 08:58:58 -0600 Subject: [PATCH 1/7] update workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index f70ebe16..700a714c 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo "${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}" > appstore_connect_api_key.json + run: echo `${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}` > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 9e16cbf6db40bef905dc0a04dd498c351d4d1ee2 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 09:11:28 -0600 Subject: [PATCH 2/7] workflow connect api key dubugging --- .github/workflows/build-ios-app.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 700a714c..e05df51f 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,9 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo `${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}` > appstore_connect_api_key.json + run: cat <<'EOF' + echo ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} > appstore_connect_api_key.json + EOF working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 0fc1cc3e98297de04a6a7cbf30eeaf6b94adff9f Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 09:14:53 -0600 Subject: [PATCH 3/7] what if? --- .github/workflows/build-ios-app.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index e05df51f..33b748f0 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,9 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: cat <<'EOF' - echo ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} > appstore_connect_api_key.json - EOF + run: echo '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 3da267f5d6146781674438fcfd777f9cd9831da4 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 09:53:48 -0600 Subject: [PATCH 4/7] update workflow --- .github/workflows/build-ios-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 33b748f0..643d7e7a 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -20,7 +20,7 @@ jobs: - run: npm run init - name: Output App Store Connect API Key JSON to Fastlane - run: echo '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json + run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json working-directory: ./ios/fastlane - run: cat appstore_connect_api_key.json From 468aae20c472ba693acb6f6bf1567e5c6170cdf2 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 10:13:15 -0600 Subject: [PATCH 5/7] do versioning correctly --- .github/workflows/build-ios-app.yml | 5 +---- ios/fastlane/Fastfile | 7 ++++++- package.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml index 643d7e7a..472c423a 100644 --- a/.github/workflows/build-ios-app.yml +++ b/.github/workflows/build-ios-app.yml @@ -15,7 +15,7 @@ jobs: node-version: 20 - name: Echo package.json version to Github ENV - run: echo BUILD_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV + run: echo VERISON_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init @@ -23,9 +23,6 @@ jobs: run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json working-directory: ./ios/fastlane - - run: cat appstore_connect_api_key.json - working-directory: ./ios/fastlane - - run: fastlane beta working-directory: ./ios env: diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 98a5271a..4274b707 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -37,8 +37,13 @@ platform :ios do app_identifier: "com.cosmonautical.jellify", readonly: true ) + + increment_version_number( + version_number: ENV['VERISON_NUMBER'], + xcodeproj: "Jellify.xcodeproj" + ) + increment_build_number( - build_number: ENV['BUILD_NUMBER'], xcodeproj: "Jellify.xcodeproj" ) build_app( diff --git a/package.json b/package.json index 1923e96e..50d236fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jellify", - "version": "0.1.6", + "version": "0.1.7", "private": true, "scripts": { "init": "npm i && npm run pod:install", From bdfbaf95a29d76bbb050cf032184a655d57c30b7 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 14:47:20 -0600 Subject: [PATCH 6/7] update workflows --- .github/workflows/build-ios.yml | 32 +++++++++++++++++++ ...build-ios-app.yml => publish-ios-beta.yml} | 0 2 files changed, 32 insertions(+) create mode 100644 .github/workflows/build-ios.yml rename .github/workflows/{build-ios-app.yml => publish-ios-beta.yml} (100%) diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml new file mode 100644 index 00000000..5b0296ae --- /dev/null +++ b/.github/workflows/build-ios.yml @@ -0,0 +1,32 @@ +name: build-ios +on: + push: + branches-ignore: + - "main" +jobs: + build-ios: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Echo package.json version to Github ENV + run: echo VERISON_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV + + - run: npm run init + + - name: Output App Store Connect API Key JSON to Fastlane + run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json + working-directory: ./ios/fastlane + + - run: fastlane build + working-directory: ./ios + env: + # FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + APPSTORE_CONNECT_API_KEY_JSON: ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }} + FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}" \ No newline at end of file diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/publish-ios-beta.yml similarity index 100% rename from .github/workflows/build-ios-app.yml rename to .github/workflows/publish-ios-beta.yml From d11889d49b48b2b78ec15e3074c9641e5af2c5f4 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Tue, 4 Feb 2025 14:54:54 -0600 Subject: [PATCH 7/7] adjust build workflow --- .github/workflows/build-ios.yml | 6 +----- ios/fastlane/Fastfile | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 5b0296ae..594b2305 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -17,11 +17,7 @@ jobs: run: echo VERISON_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV - run: npm run init - - - name: Output App Store Connect API Key JSON to Fastlane - run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json - working-directory: ./ios/fastlane - + - run: fastlane build working-directory: ./ios env: diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 4274b707..1ef7c509 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -20,7 +20,7 @@ platform :ios do lane :build do match( - type: "development", + type: "appstore", app_identifier: "com.cosmonautical.jellify", readonly: true )