From 7eb7aa5104b15a0449d1af9913d4832ef86b3094 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Mon, 3 Feb 2025 10:19:02 -0500 Subject: [PATCH 1/3] fix: always pass context to classCode function --- lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart | 2 +- lib/pangea/chat_settings/widgets/class_invitation_buttons.dart | 2 +- pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart b/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart index 0d1c7b397..b9ec58f19 100644 --- a/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart +++ b/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart @@ -107,7 +107,7 @@ void chatListHandleSpaceTap( if (rooms.any((s) => s.spaceChildren.any((c) => c.roomId == space.id))) { autoJoin(space); } else if (justInputtedCode != null && - justInputtedCode == space.classCode) { + justInputtedCode == space.classCode(context)) { // do nothing } else { showAlertDialog(context); diff --git a/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart b/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart index 638722a63..d44cf0e20 100644 --- a/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart +++ b/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart @@ -41,7 +41,7 @@ class ClassInvitationButtons extends StatelessWidget { final String initialUrl = kIsWeb ? html.window.origin! : Environment.frontendURL; FluffyShare.share( - "$initialUrl/#/join_with_link?${SpaceConstants.classCode}=${room.classCode}", + "$initialUrl/#/join_with_link?${SpaceConstants.classCode}=${room.classCode(context)}", context, ); }, diff --git a/pubspec.yaml b/pubspec.yaml index 337bedc18..a590e17f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ description: Learn a language while texting your friends. # Pangea# publish_to: none # On version bump also increase the build number for F-Droid -version: 4.1.6+1 +version: 4.1.7+3 environment: sdk: ">=3.0.0 <4.0.0" From 694fd08701a05338f295098b2313ef9b7657648f Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Thu, 20 Feb 2025 16:33:09 -0500 Subject: [PATCH 2/3] chore: bump version number (#1872) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a590e17f1..40b61d5e9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ description: Learn a language while texting your friends. # Pangea# publish_to: none # On version bump also increase the build number for F-Droid -version: 4.1.7+3 +version: 4.1.7+4 environment: sdk: ">=3.0.0 <4.0.0" From 1f4418db60be2a3df8ab39c9072f0715fce664e4 Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Thu, 20 Feb 2025 16:38:37 -0500 Subject: [PATCH 3/3] fix: add release workflow updates to production branch (#1873) --- .github/workflows/release.yaml | 43 ++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2ac72c2a8..02daf3233 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,9 +1,9 @@ name: Release Workflow on: - release: - types: - - created + push: + branches: + - production concurrency: group: release_workflow @@ -15,7 +15,28 @@ env: WEB_APP_ENV: ${{ vars.WEB_APP_ENV }} jobs: + create_release: + name: "Tagged Release" + runs-on: "ubuntu-latest" + outputs: + upload_url: ${{ steps.create_release.outputs.upload_url }} + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Get Version from pubspec.yaml + run: echo "VERSION=$(grep '^version:' pubspec.yaml | cut -d ' ' -f2 | tr -d '\r')" >> $GITHUB_ENV + - name: Create GitHub Release + id: create_release + uses: ncipollo/release-action@v1 + with: + name: Release v${{ env.VERSION }} + tag: ${{ env.VERSION }} + draft: false + prerelease: false + generateReleaseNotes: true + build_web: + needs: create_release runs-on: ubuntu-latest environment: production steps: @@ -63,12 +84,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.PAGES_DEPLOY_TOKEN }} with: - upload_url: ${{ github.event.release.upload_url }} + upload_url: ${{ needs.create_release.outputs.upload_url }} asset_path: pangeachat-web.tar.gz asset_name: pangeachat-web.tar.gz asset_content_type: application/gzip build_apk: + needs: create_release runs-on: ubuntu-latest environment: production env: @@ -120,15 +142,16 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.PAGES_DEPLOY_TOKEN }} with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: build/app/outputs/apk/release/app-release.apk + upload_url: ${{ needs.create_release.outputs.upload_url }} + asset_path: build/app/outputs/flutter-apk/app-release.apk asset_name: pangeachat.apk asset_content_type: application/vnd.android.package-archive build_linux: strategy: matrix: - arch: [ x64, arm64 ] - runs-on: ${{ matrix.arch == 'arm64' && 'self-hosted' || 'ubuntu-latest'}} + arch: [ x64 ] + runs-on: ubuntu-latest + needs: create_release steps: - uses: actions/checkout@v4 - run: cat .github/workflows/versions.env >> $GITHUB_ENV @@ -149,7 +172,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.PAGES_DEPLOY_TOKEN }} with: - upload_url: ${{ github.event.release.upload_url }} + upload_url: ${{ needs.create_release.outputs.upload_url }} asset_path: pangeachat-linux-${{ matrix.arch }}.tar.gz asset_name: pangeachat-linux-${{ matrix.arch }}.tar.gz asset_content_type: application/gzip @@ -179,4 +202,4 @@ jobs: aws s3 sync ./build/web s3://$WEBAPP_S3_BUCKET - name: AWS CloudFront Invalidation run: | - aws cloudfront create-invalidation --distribution-id $CF_DISTRIBUTION_ID --paths "/*" + aws cloudfront create-invalidation --distribution-id $CF_DISTRIBUTION_ID --paths "/*" \ No newline at end of file