From ea5705a6def259d1201f5b46f91a8246ee654405 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 24 Dec 2022 12:55:51 +0100
Subject: [PATCH] Enable corepack for yarn 3

---
 .github/workflows/build.yml                 | 63 ++++++++-------------
 fastlane/metadata/en-US/release_notes.txt   |  1 +
 fastlane/metadata/zh-Hans/release_notes.txt |  3 +-
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25c18c31..adc433f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,20 +9,16 @@ jobs:
   build-ios:
     runs-on: macos-12
     steps:
-      - name: -- Step 0 -- Extract branch name
-        uses: tj-actions/branch-names@v6
+      - uses: tj-actions/branch-names@v6
         id: branch
-      - name: -- Step 1 -- Checkout code
-        uses: actions/checkout@v3
-      - name: -- Step 2 -- Setup node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
-      - name: -- Step 3 -- Install node dependencies
-        run: yarn install
-      - name: -- Step 4 -- Install ruby dependencies
-        run: bundle install
-      - name: -- Step 5 -- Run fastlane
+      - run: corepack enable
+      - run: yarn install
+      - run: bundle install
+      - run: yarn app:build ios
         env:
           DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
           ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
@@ -40,30 +36,24 @@ jobs:
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
           APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
           GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn app:build ios
 
   build-android:
     runs-on: macos-12
     steps:
-      - name: -- Step 0 -- Extract branch name
-        uses: tj-actions/branch-names@v6
+      - uses: tj-actions/branch-names@v6
         id: branch
-      - name: -- Step 1 -- Checkout code
-        uses: actions/checkout@v3
-      - name: -- Step 2 -- Setup node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
-      - name: -- Step 3 -- Setup Java
-        uses: actions/setup-java@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '11'
-      - name: -- Step 4 -- Install node dependencies
-        run: yarn install
-      - name: -- Step 5 -- Install ruby dependencies
-        run: bundle install
-      - name: -- Step 6 -- Run fastlane
+      - run: corepack enable
+      - run: yarn install
+      - run: bundle install
+      - run: yarn app:build android
         env:
           ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
           SENTRY_ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
@@ -75,31 +65,25 @@ jobs:
           ANDROID_KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_KEY_PASSWORD }}
           SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }}
           GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn app:build android
 
   create-release:
     runs-on: macos-12
     needs: [build-ios, build-android]
     steps:
-      - name: -- Step 0 -- Extract branch name
-        uses: tj-actions/branch-names@v6
+      - uses: tj-actions/branch-names@v6
         id: branch
-      - name: -- Step 1 -- Checkout code
-        uses: actions/checkout@v3
-      - name: -- Step 2 -- Setup node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
-      - name: -- Step 3 -- Setup Java
-        uses: actions/setup-java@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '11'
-      - name: -- Step 4 -- Install node dependencies
-        run: yarn install
-      - name: -- Step 5 -- Install ruby dependencies
-        run: bundle install
-      - name: -- Step 6 -- Run fastlane
+      - run: corepack enable
+      - run: yarn install
+      - run: bundle install
+      - run: yarn app:build release
         env:
           ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
           SENTRY_ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
@@ -113,4 +97,3 @@ jobs:
           ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
           ANDROID_KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_KEY_PASSWORD }}
           FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn app:build release
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
index 4fe3f481..731c525f 100644
--- a/fastlane/metadata/en-US/release_notes.txt
+++ b/fastlane/metadata/en-US/release_notes.txt
@@ -1,3 +1,4 @@
 Enjoy toooting! This version includes following improvements and fixes:
 - Allowing adding more context of reports
 - Option to disable autoplay gif
+- Hide boosts from users
\ No newline at end of file
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
index 6790fea0..af941da8 100644
--- a/fastlane/metadata/zh-Hans/release_notes.txt
+++ b/fastlane/metadata/zh-Hans/release_notes.txt
@@ -1,3 +1,4 @@
 toooting愉快！此版本包括以下改进和修复：
 - 可添加举报细节
-- 新增暂停自动播放gif动画选项
\ No newline at end of file
+- 新增暂停自动播放gif动画选项
+- 隐藏用户的转嘟
\ No newline at end of file