diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index 175dcd98fb40..2e7a25fdc173 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -5,6 +5,7 @@ on: types: [ opened, synchronize, edited ] paths: - 'app-ios/**' + - '.github/workflows/swift-test.yml' push: branches: - dev-* @@ -42,11 +43,32 @@ jobs: swift-version: ${{ env.swift-version }} - name: Install Homebrew uses: Homebrew/actions/setup-homebrew@d54a6744d5fcdff54b45a9659f3e17f769389952 - - name: Install Code Quality Tools - run: brew install swiftlint swift-format + - name: Install Homebrew dependencies + run: | + brew install swiftlint swift-format xcodegen + brew upgrade rustup + - name: Versions + run: | + rustup --version + cargo --version + rustc --version + - name: Add rust target + run: rustup target add aarch64-apple-ios-sim - name: Lint working-directory: ./app-ios run: ./lint.sh lint:check - name: Format working-directory: ./app-ios run: ./lint.sh style:check + - name: Xcodegen sdk + working-directory: tuta-sdk/ios + run: xcodegen +# Tests do not run on arm64 yet because of OpenSSL +# see https://github.com/tutao/tutanota/issues/6603 +# - name: Test +# working-directory: app-ios +# run: | +# mkdir -p ../build +# xcodegen +# fastlane test + diff --git a/app-ios/fastlane/Fastfile b/app-ios/fastlane/Fastfile index 5c4554f3f451..6bdc9d2b5553 100644 --- a/app-ios/fastlane/Fastfile +++ b/app-ios/fastlane/Fastfile @@ -140,6 +140,10 @@ platform :ios do scheme: "tuta debug", devices: ["iphone-15-ios-17-4"] ) + run_tests( + scheme: "TutanotaSharedFramework", + devices: ["iphone-15-ios-17-4"] + ) end desc "Renew prod adhoc cert" diff --git a/ci/Ios.Jenkinsfile b/ci/Ios.Jenkinsfile index 78cac8609af4..4560aa0fa982 100644 --- a/ci/Ios.Jenkinsfile +++ b/ci/Ios.Jenkinsfile @@ -32,14 +32,15 @@ pipeline { } stages { - stage('Check Github') { - steps { - script { - def util = load "ci/jenkins-lib/util.groovy" - util.checkGithub() - } - } - } + // FIXME: roll back +// stage('Check Github') { +// steps { +// script { +// def util = load "ci/jenkins-lib/util.groovy" +// util.checkGithub() +// } +// } +// } stage("Run tests") { agent { label 'mac-intel'