diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml index be5fd503a..e69de29bb 100644 --- a/.github/workflows/swiftlint.yml +++ b/.github/workflows/swiftlint.yml @@ -1,24 +0,0 @@ -name: SwiftLint - -on: - push: - branches: - - master - pull_request: - branches: - - master - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - SwiftLint: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: GitHub Action for SwiftLint - uses: norio-nomura/action-swiftlint@3.2.1 - diff --git a/.github/workflows/uitests.yml b/.github/workflows/uitests.yml index 225efb743..e69de29bb 100644 --- a/.github/workflows/uitests.yml +++ b/.github/workflows/uitests.yml @@ -1,134 +0,0 @@ -name: Build main target - -on: - pull_request: - paths: - - '.github/workflows/**' - - NextcloudTalk.xcodeproj/** - - NextcloudTalk/** - - NextcloudTalkUITests/** - - NotificationServiceExtension/** - - ShareExtension/** - - push: - branches: - - main - - master - - stable* - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -permissions: - contents: read - -jobs: - build-and-test: - name: Build and Test - runs-on: macos-latest - if: github.event.pull_request.draft == false - - strategy: - matrix: - # Test with stable23 as well to find regressions in older versions - test-branches: ['stable23', 'stable27', 'master'] - - env: - WORKSPACE: NextcloudTalk.xcworkspace - DESTINATION: platform=iOS Simulator,name=iPhone 14,OS=16.2 - SCHEME: NextcloudTalk - TEST_BRANCH: ${{ matrix.test-branches }} - CONTAINER_NAME: nextcloud_test - SERVER_PORT: 8080 - - steps: - - name: Checkout app - uses: actions/checkout@v3 - with: - submodules: true - - - uses: actions/cache@v3 - with: - path: Pods - key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} - restore-keys: | - ${{ runner.os }}-pods- - - - name: Set up php 8.2 - uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 - if: matrix.test-branches != 'stable23' - with: - php-version: 8.2 - # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation - extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql - coverage: none - ini-file: development - # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on - ini-values: apc.enable_cli=on, disable_functions= - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up php 8.0 - uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 - if: matrix.test-branches == 'stable23' - with: - php-version: 8.0 - # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation - extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql - coverage: none - ini-file: development - # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on - ini-values: apc.enable_cli=on, disable_functions= - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Checkout server - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - with: - submodules: true - repository: nextcloud/server - path: server - ref: ${{ matrix.test-branches }} - - - name: Checkout Talk - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - with: - repository: nextcloud/spreed - path: server/apps/spreed - ref: ${{ matrix.test-branches }} - - - name: Set up production dependencies - working-directory: server/apps/spreed - run: composer i --no-dev - - - name: Set up Nextcloud - run: | - mkdir server/data - ./server/occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin - ./server/occ config:system:set hashing_default_password --value=true --type=boolean - ./server/occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu" - ./server/occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu" - ./server/occ app:enable --force spreed - PHP_CLI_SERVER_WORKERS=3 php -S localhost:8080 -t server/ & - - - name: Set up dependencies talk-ios - run: | - pod install - - - name: Build & Test NextcloudTalk iOS - run: | - set -o pipefail && xcodebuild test -workspace $WORKSPACE \ - -scheme "$SCHEME" \ - -destination "$DESTINATION" \ - -test-iterations 3 \ - -retry-tests-on-failure \ - -resultBundlePath "testResult.xcresult" \ - | xcpretty - - - name: Upload test results - uses: actions/upload-artifact@v3 - if: ${{ !cancelled() }} - with: - name: testResults-${{ matrix.test-branches }}.xcresult - path: "testResult.xcresult" diff --git a/generate-localizable-strings-file.sh b/generate-localizable-strings-file.sh index fc599d8a6..279ab4089 100755 --- a/generate-localizable-strings-file.sh +++ b/generate-localizable-strings-file.sh @@ -5,7 +5,7 @@ echo 'Generating Localizable.strings file...' cd NextcloudTalk genstrings -o en.lproj *.m *.swift ../ShareExtension/*.m ../NotificationServiceExtension/*.m ../ThirdParty/SlackTextViewController/Source/*.m -iconv -f UTF-16LE -t UTF-8 en.lproj/Localizable.strings > en.lproj/Localizable-utf8.strings +iconv -f UTF-16 -t UTF-8 en.lproj/Localizable.strings > en.lproj/Localizable-utf8.strings mv en.lproj/Localizable-utf8.strings en.lproj/Localizable.strings echo 'Localizable.strings file generated!'