diff --git a/.github/workflows/publish-stable-release.yml b/.github/workflows/publish-stable-release.yml index c05348d38..13daf4504 100644 --- a/.github/workflows/publish-stable-release.yml +++ b/.github/workflows/publish-stable-release.yml @@ -85,7 +85,6 @@ jobs: with: access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }} url: ${{ secrets.MASTODON_URL }} - message: "${{ needs.extractChangelog.outputs.release-name }} released.\n\n${{ steps.changelog.outputs.notes }}\n\n#Monal #ios #macos #xmpp #im #chat #messaging" visibility: "public" language: "en" diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml index 7270e066d..8c3cfcd80 100644 --- a/.github/workflows/stable.build-push.yml +++ b/.github/workflows/stable.build-push.yml @@ -125,15 +125,19 @@ jobs: - name: Create fastlane metadata directory id: metadata env: - CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }} + CHANGELOG_IOS: ${{ steps.releasenotes.outputs.notes_ios }} + CHANGELOG_MACOS: ${{ steps.releasenotes.outputs.notes_macos }} run: | - path="$(mktemp -d)" - echo -n "$CHANGELOG" > "$path/release_notes.txt" - echo "path=$path" | tee /dev/stderr >> "$GITHUB_OUTPUT" + path_ios="$(mktemp -d)" + echo -n "$CHANGELOG_IOS" > "$path_ios/release_notes.txt" + echo "path_ios=$path_ios" | tee /dev/stderr >> "$GITHUB_OUTPUT" + path_macos="$(mktemp -d)" + echo -n "$CHANGELOG_MACOS" > "$path_macos/release_notes.txt" + echo "path_macos=$path_macos" | tee /dev/stderr >> "$GITHUB_OUTPUT" - name: Publish ios to appstore connect #run: xcrun altool --upload-app --file ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y --team-id S8D843U34Y -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)" env: - DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path }} + DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_ios }} run: | fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata: true skip_screenshots: true - name: Notarize catalyst @@ -160,14 +164,15 @@ jobs: - name: Publish catalyst to appstore connect #run: xcrun altool --upload-app --file ./Monal/build/app/Monal.pkg --type macos --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)" --primary-bundle-id maccatalyst.G7YU7X7KRJ.SworIM env: - DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path }} + DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_macos }} run: | fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata: true skip_screenshots: true # - name: Update xmpp.org client list with new timestamp # run: ./scripts/push_xmpp.org.sh - name: Remove fastlane metadata directory run: | - rm -rf "${{ steps.metadata.outputs.path }}" + rm -rf "${{ steps.metadata.outputs.path_ios }}" + rm -rf "${{ steps.metadata.outputs.path_macos }}" - name: Create Draft Release id: draftrelease uses: softprops/action-gh-release@v2