Skip to content

Commit

Permalink
Merge pull request #2444 from minvws/feature/510-to-main
Browse files Browse the repository at this point in the history
Feature/510 to main
  • Loading branch information
Rool authored Dec 19, 2023
2 parents e43c5ed + 2041227 commit 8696d29
Showing 1,055 changed files with 156 additions and 104,538 deletions.
70 changes: 0 additions & 70 deletions .github/actions/build-core/action.yml

This file was deleted.

69 changes: 0 additions & 69 deletions .github/actions/build-web-pdf-tools/action.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -34,27 +34,6 @@ updates:
day: monday
time: "08:30"
timezone: Europe/Amsterdam
- package-ecosystem: "swift"
directory: "/Packages/DataMigration"
schedule:
interval: weekly
day: monday
time: "08:30"
timezone: Europe/Amsterdam
- package-ecosystem: "swift"
directory: "/Packages/Managers"
schedule:
interval: weekly
day: monday
time: "08:30"
timezone: Europe/Amsterdam
- package-ecosystem: "swift"
directory: "/Packages/Models"
schedule:
interval: weekly
day: monday
time: "08:30"
timezone: Europe/Amsterdam
- package-ecosystem: "swift"
directory: "/Packages/Persistence"
schedule:
@@ -90,13 +69,6 @@ updates:
day: monday
time: "08:30"
timezone: Europe/Amsterdam
- package-ecosystem: "swift"
directory: "/Packages/Transport"
schedule:
interval: weekly
day: monday
time: "08:30"
timezone: Europe/Amsterdam
- package-ecosystem: "swift"
directory: "/Packages/TestingShared"
schedule:
12 changes: 0 additions & 12 deletions .github/workflows/deploy-testflight.yml
Original file line number Diff line number Diff line change
@@ -14,8 +14,6 @@ env:
APPSTORE_KEY_BASE64_FILENAME: appstore-apikey.p8
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 10
MOBILE_CORE_COMMIT_HASH: 0b1d6d8c2a699449f614e90a0e2e5cc643fa67a1 # v0.4.5
WEB_PDF_TOOLS_COMMIT_HASH: 530e22f23d98dc41c1611b1ecfb18719e5ab2570 # v4.1.6

jobs:
upload:
@@ -49,16 +47,6 @@ jobs:
git lfs pull
git checkout .
- name: Build mobile core
uses: ./.github/actions/build-core
with:
mobile_core_commit_hash: ${{ env.MOBILE_CORE_COMMIT_HASH }}

- name: Build web pdf tools
uses: ./.github/actions/build-web-pdf-tools
with:
web_pdf_tools_commit_hash: ${{ env.WEB_PDF_TOOLS_COMMIT_HASH }}

- name: Generate project
run: |
make generate_project
22 changes: 0 additions & 22 deletions .github/workflows/sigrid-publish.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/sigrid-pullrequest.yml

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/smoketest-ui.yml
Original file line number Diff line number Diff line change
@@ -11,8 +11,6 @@ env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 10
MOBILE_CORE_COMMIT_HASH: 0b1d6d8c2a699449f614e90a0e2e5cc643fa67a1 # v0.4.5
WEB_PDF_TOOLS_COMMIT_HASH: 530e22f23d98dc41c1611b1ecfb18719e5ab2570 # v4.1.6

jobs:
smoketest-ui:
@@ -45,16 +43,6 @@ jobs:
git lfs pull
git checkout .
- name: Build mobile core
uses: ./.github/actions/build-core
with:
mobile_core_commit_hash: ${{ env.MOBILE_CORE_COMMIT_HASH }}

- name: Build web pdf tools
uses: ./.github/actions/build-web-pdf-tools
with:
web_pdf_tools_commit_hash: ${{ env.WEB_PDF_TOOLS_COMMIT_HASH }}

- name: Generate project
run: |
make generate_project
18 changes: 3 additions & 15 deletions .github/workflows/template_firebase-deploy.yml
Original file line number Diff line number Diff line change
@@ -27,8 +27,6 @@ env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 10
MOBILE_CORE_COMMIT_HASH: 0b1d6d8c2a699449f614e90a0e2e5cc643fa67a1 # v0.4.5
WEB_PDF_TOOLS_COMMIT_HASH: 530e22f23d98dc41c1611b1ecfb18719e5ab2570 # v4.1.6

jobs:
template_firebase-deploy:
@@ -67,23 +65,13 @@ jobs:
git lfs pull
git checkout .
- name: Build mobile core
uses: ./.github/actions/build-core
with:
mobile_core_commit_hash: ${{ env.MOBILE_CORE_COMMIT_HASH }}

- name: Build web pdf tools
uses: ./.github/actions/build-web-pdf-tools
with:
web_pdf_tools_commit_hash: ${{ env.WEB_PDF_TOOLS_COMMIT_HASH }}

- name: Generate project
run: |
make generate_project
- name: Setup Imagemagick for icon overlays
run: |
make homebrew_ci_imagemagick
# - name: Setup Imagemagick for icon overlays
# run: |
# make homebrew_ci_imagemagick

- name: Build and deploy
timeout-minutes: 45
12 changes: 0 additions & 12 deletions .github/workflows/test-ui.yml
Original file line number Diff line number Diff line change
@@ -9,8 +9,6 @@ env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 10
MOBILE_CORE_COMMIT_HASH: 0b1d6d8c2a699449f614e90a0e2e5cc643fa67a1 # v0.4.5
WEB_PDF_TOOLS_COMMIT_HASH: 530e22f23d98dc41c1611b1ecfb18719e5ab2570 # v4.1.6

jobs:
test-ui:
@@ -38,16 +36,6 @@ jobs:
git lfs pull
git checkout .
- name: Build mobile core
uses: ./.github/actions/build-core
with:
mobile_core_commit_hash: ${{ env.MOBILE_CORE_COMMIT_HASH }}

- name: Build web pdf tools
uses: ./.github/actions/build-web-pdf-tools
with:
web_pdf_tools_commit_hash: ${{ env.WEB_PDF_TOOLS_COMMIT_HASH }}

- name: Generate project
run: |
make generate_project
12 changes: 0 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -14,8 +14,6 @@ env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 10
MOBILE_CORE_COMMIT_HASH: 0b1d6d8c2a699449f614e90a0e2e5cc643fa67a1 # v0.4.5
WEB_PDF_TOOLS_COMMIT_HASH: 530e22f23d98dc41c1611b1ecfb18719e5ab2570 # v4.1.6

jobs:

@@ -54,16 +52,6 @@ jobs:
git lfs pull
git checkout .
- name: Build mobile core
uses: ./.github/actions/build-core
with:
mobile_core_commit_hash: ${{ env.MOBILE_CORE_COMMIT_HASH }}

- name: Build web pdf tools
uses: ./.github/actions/build-web-pdf-tools
with:
web_pdf_tools_commit_hash: ${{ env.WEB_PDF_TOOLS_COMMIT_HASH }}

- name: Generate project
run: |
make generate_project
2 changes: 1 addition & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ excluded:
- Pods
- Packages/*/.build
- Packages/*/Package.swift
- Vendor
- vendor
- Sources/CTR/Infrastructure/Resources/R.generated.swift
- Packages/*/.build
force_cast: warning
Loading

0 comments on commit 8696d29

Please sign in to comment.