Sync with fedibtc/fedi b0c5ce39cf227d67ff856d1a590edfb1f1d03405

fedixyz · Oct 12, 2024 · 8d64209 · 8d64209
1 parent be1cf42
commit 8d64209
Show file tree

Hide file tree

Showing 289 changed files with 5,306 additions and 3,089 deletions.
diff --git a/.config/flakebox/shellHook.sh b/.config/flakebox/shellHook.sh
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,34 @@
+---
+name: Bug Report Template
+about: For reporting any bugs/issues with the Fedi app
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
+_Please fill in as many fields as you can so we can swiftly investigate_
+#### Detailed Description:
+
+
+#### Context
+_Federation_: 
+_Phone OS_: 
+_User Name_"
+
+#### How to reproduce:
+- A
+- B
+- C
+
+#### Expected Behavior:
+
+
+#### Actual Behavior: 
+
+
+#### Logs:
+
+
+#### Screenshots/Videos:
diff --git a/.github/workflows/bump-version-native-ui.yml b/.github/workflows/bump-version-native-ui.yml
@@ -16,7 +16,7 @@ jobs:
  contents: write
  pull-requests: write
  name: Update version to match release branch
- runs-on: [self-hosted, linux]
+ runs-on: [self-hosted, macos, arm64]
  if: contains(github.ref, 'release/')
  steps:
  - name: Checkout repo

diff --git a/.github/workflows/deploy-to-gp-internal-testing-nightly.yml b/.github/workflows/deploy-to-gp-internal-testing-nightly.yml
@@ -6,6 +6,7 @@ on:
 jobs:
  release-android:
  name: Build Android AAB & Upload to Google Play Dev Console
+ timeout-minutes: 80
  runs-on: [self-hosted, linux]
  steps:
  - name: Checkout repo
@@ -20,12 +21,6 @@ jobs:
  name: fedibtc
  authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
- - name: Build bridge
- run: nix develop -c env BUILD_ALL_BRIDGE_TARGETS=1 CARGO_PROFILE=release scripts/ci/run-in-fs-dir-cache.sh build-bridge-android ./scripts/bridge/build-bridge-android.sh
-
- - name: Build UI dependencies
- run: nix develop -c ./scripts/ui/build-deps.sh
-
  - name: Generate release credentials
  env:
  ANDROID_KEYSTORE_FILE_ENCODED: ${{ secrets.ANDROID_KEYSTORE_FILE_ENCODED }}
@@ -34,9 +29,12 @@ jobs:
  run: nix develop -c ./scripts/ci/make-android-release-creds.sh
 
  - name: Execute Fastlane command
+ timeout-minutes: 60
  env:
  FLAVOR: 'nightly'
- # Consider: should we even have separate steps above for this?
- BUILD_BRIDGE: 0
- BUILD_UI_DEPS: 0
- run: nix develop -c ./scripts/ui/deploy-to-google-play.sh
+ BUILD_BRIDGE: 1
+ BUILD_UI_DEPS: 1
+ run: |
+ nix develop -c \
+ env BUILD_ALL_BRIDGE_TARGETS=1 CARGO_PROFILE=release scripts/ci/run-in-fs-dir-cache.sh build-bridge-android \
+ ./scripts/ui/deploy-to-google-play.sh
diff --git a/.github/workflows/deploy-to-gp-internal-testing.yml b/.github/workflows/deploy-to-gp-internal-testing.yml
@@ -6,6 +6,7 @@ on:
 jobs:
  release-android:
  name: Build Android AAB & Upload to Google Play Dev Console
+ timeout-minutes: 80
  runs-on: [self-hosted, linux]
  steps:
  - name: Checkout repo
@@ -20,12 +21,6 @@ jobs:
  name: fedibtc
  authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
- - name: Build bridge
- run: nix develop -c env BUILD_ALL_BRIDGE_TARGETS=1 CARGO_PROFILE=release scripts/ci/run-in-fs-dir-cache.sh build-bridge-android ./scripts/bridge/build-bridge-android.sh
-
- - name: Build UI dependencies
- run: nix develop -c ./scripts/ui/build-deps.sh
-
  - name: Generate release credentials
  env:
  ANDROID_KEYSTORE_FILE_ENCODED: ${{ secrets.ANDROID_KEYSTORE_FILE_ENCODED }}
@@ -34,8 +29,11 @@ jobs:
  run: nix develop -c ./scripts/ci/make-android-release-creds.sh
 
  - name: Execute Fastlane command
+ timeout-minutes: 60
  env:
- # Consider: should we even have separate steps above for this?
- BUILD_BRIDGE: 0
- BUILD_UI_DEPS: 0
- run: nix develop -c ./scripts/ui/deploy-to-google-play.sh
+ BUILD_BRIDGE: 1
+ BUILD_UI_DEPS: 1
+ run: |
+ nix develop -c \
+ env BUILD_ALL_BRIDGE_TARGETS=1 CARGO_PROFILE=release scripts/ci/run-in-fs-dir-cache.sh build-bridge-android \
+ ./scripts/ui/deploy-to-google-play.sh
diff --git a/.github/workflows/deploy-to-testflight-nightly.yml b/.github/workflows/deploy-to-testflight-nightly.yml
@@ -6,6 +6,7 @@ on:
 jobs:
  release-ios:
  name: Build iOS app and upload to TestFlight
+ timeout-minutes: 60
  runs-on: [self-hosted, macos, arm64]
  steps:
  - name: Checkout repo
@@ -37,6 +38,7 @@ jobs:
  run: nix develop -c ./scripts/ci/make-testflight-creds.sh
 
  - name: Execute fastlane beta lane for CI
+ timeout-minutes: 40
  env:
  GH_PAT_FEDI_FETCH_IOS_CERTS: ${{ secrets.GH_PAT_FEDI_FETCH_IOS_CERTS }}
  MATCH_KEYCHAIN_NAME: ${{ secrets.APP_STORE_CONNECT_KEYCHAIN_NAME }}

diff --git a/.github/workflows/deploy-to-testflight.yml b/.github/workflows/deploy-to-testflight.yml
@@ -16,6 +16,7 @@ jobs:
  startsWith(github.head_ref, 'release/')
  )
  name: Build iOS app and upload to TestFlight
+ timeout-minutes: 60
  runs-on: [self-hosted, macos, arm64]
  steps:
  - name: Checkout repo
@@ -47,6 +48,7 @@ jobs:
  run: nix develop -c ./scripts/ci/make-testflight-creds.sh
 
  - name: Execute fastlane beta lane for CI
+ timeout-minutes: 40
  env:
  GH_PAT_FEDI_FETCH_IOS_CERTS: ${{ secrets.GH_PAT_FEDI_FETCH_IOS_CERTS }}
  MATCH_KEYCHAIN_NAME: ${{ secrets.APP_STORE_CONNECT_KEYCHAIN_NAME }}

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -162,6 +162,9 @@ jobs:
  name: fedibtc
  authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
+ - name: Build fedi-api-types
+ run: nix build -L .#ci.fedi-api-types
+
  - name: Build fedi-fedimint-pkgs
  run: nix build -L .#ci.fedi-fedimint-pkgs
 
@@ -171,6 +174,9 @@ jobs:
  - name: Build fedi-fedimint-cli
  run: nix build -L .#ci.fedi-fedimint-cli
 
+ - name: Build fedi-api-types
+ run: nix build -L .#ci.fedi-api-types
+
  - name: Build fedi-wasm
  run: nix build -L .#wasm32-unknown.ci.fedi-wasm
 

diff --git a/.github/workflows/upload-android-apk.yml b/.github/workflows/upload-android-apk.yml
@@ -57,6 +57,14 @@ jobs:
  BUILD_UI_DEPS: 0
  run: nix develop -c ./scripts/ui/build-production-apk.sh
 
+ - name: Verify bridge hash
+ env:
+ APK_PATH: ${{ steps.prep-apk.outputs.APK_PATH }}
+ run: |
+ set -euo pipefail
+
+ bash ./scripts/ci/verify-bridge-hash.sh "$APK_PATH" "${{ github.sha }}"
+
  - name: Create draft GitHub release with APK
  uses: softprops/action-gh-release@v2
  with: