Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into update-orbitdb
Browse files Browse the repository at this point in the history
  • Loading branch information
adrastaea committed Dec 2, 2024
1 parent 23b0a50 commit d91a408
Show file tree
Hide file tree
Showing 78 changed files with 3,766 additions and 1,028 deletions.
Binary file modified .github/secrets/Certificates.p12.gpg
Binary file not shown.
3 changes: 1 addition & 2 deletions .github/secrets/decrypt_secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ gpg --quiet --batch --yes --decrypt --passphrase="$IOS_CERTIFICATE_KEY" --output

mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles

cp ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/718ac015-309f-49b6-9653-f6cf84a6377c.mobileprovision

cp ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/762df280-302c-4336-a56d-c74914169337.mobileprovision

security create-keychain -p "" build.keychain
security import ./.github/secrets/Certificates.p12 -t agg -k ~/Library/Keychains/build.keychain -P "$IOS_CERTIFICATE_KEY" -A
Expand Down
Binary file modified .github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: workflow_dispatch
jobs:
detox-ios:
timeout-minutes: 25
runs-on: [macos-latest-xlarge]
runs-on: [macos-13-xlarge]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04] #, macos-latest, windows-2019]
os: [ubuntu-20.04] #, macos-13, windows-2019]

steps:
- name: 'Print OS'
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/mobile-deploy-ios-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Test IOS build

on:
pull_request:

jobs:
test-build-ios:
# needs: detox-ios
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-13]

steps:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
submodules: 'recursive'
lfs: true

- name: Install gpg
run: brew install gnupg

- name: Setup XCode
uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98 # v1.5.1
with:
xcode-version: '15.2'

- name: Setup environment
uses: ./.github/actions/setup-env
with:
cachePrefix: "deploy-ios"
bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle"

- name: Install pod dependencies
run: |
cd ./packages/mobile/ios
pod install
shell: bash

- name: Setup provisioning profile
run: ./.github/secrets/decrypt_secrets.sh
env:
IOS_PROFILE_KEY: ${{ secrets.IOS_PROFILE_KEY }}
IOS_CERTIFICATE_KEY: ${{ secrets.IOS_CERTIFICATE_KEY }}

- name: Build
run: |
cd ./packages/mobile/ios
xcodebuild archive \
-workspace Quiet.xcworkspace \
-scheme Quiet \
-configuration Release \
-archivePath build/Quiet.xcarchive \
PROVISIONING_PROFILE="762df280-302c-4336-a56d-c74914169337" \
CODE_SIGN_IDENTITY="Apple Distribution: A Quiet LLC (CTYKSWN9T4)"
- name: Export .ipa
run: |
cd ./packages/mobile/ios
xcodebuild \
-exportArchive \
-archivePath build/Quiet.xcarchive \
-exportOptionsPlist ci.plist \
-exportPath build/
- name: Cleanup environment
if: always()
run: security delete-keychain build.keychain && rm -f ~/Library/MobileDevice/Provisioning\ Profiles/*.mobileprovision
6 changes: 3 additions & 3 deletions .github/workflows/mobile-deploy-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [macos-latest]
os: [macos-13]

steps:
- name: "Print OS"
Expand Down Expand Up @@ -59,8 +59,8 @@ jobs:
-scheme Quiet \
-configuration Release \
-archivePath build/Quiet.xcarchive \
PROVISIONING_PROFILE="718ac015-309f-49b6-9653-f6cf84a6377c" \
CODE_SIGN_IDENTITY="Apple Distribution: Zbay LLC (CTYKSWN9T4)"
PROVISIONING_PROFILE="762df280-302c-4336-a56d-c74914169337" \
CODE_SIGN_IDENTITY="Apple Distribution: A Quiet LLC (CTYKSWN9T4)"
- name: Export .ipa
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules
lerna-debug.log
*.log
c4/.structurizr
c4/workspace.json
.ignore
Expand Down
2 changes: 1 addition & 1 deletion 3rd-party/auth
Submodule auth updated 0 files
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@

## [unreleased]

### Chores
### New features

* Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
* Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
* Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))

## [2.3.2]

### Chores

* Moved some responsibilities of identity management to the backend ([#2617](https://github.com/TryQuiet/quiet/pull/2617))
* Moved some responsibilities of identity management to the backend ([#2602](https://github.com/TryQuiet/quiet/issues/2602))
* Added auth submodule in preparation for future encyrption work ([#2623](https://github.com/TryQuiet/quiet/issues/2623))

### Fixes

Expand Down
Loading

0 comments on commit d91a408

Please sign in to comment.