diff --git a/.github/workflows/ios-release.yml b/.github/workflows/ios-release.yml index 3c4b99280..8e034830b 100644 --- a/.github/workflows/ios-release.yml +++ b/.github/workflows/ios-release.yml @@ -6,10 +6,6 @@ on: jobs: build: runs-on: [self-hosted, macOS, ARM64] - env: - BUILDTYPE: Release - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 defaults: run: working-directory: platform/ios @@ -20,55 +16,9 @@ jobs: with: submodules: recursive fetch-depth: 0 - - - name: Install macos dependencies - run: | - brew list cmake || brew install cmake - brew list ccache || brew install ccache - brew list pkg-config || brew install pkg-config - brew list glfw || brew install glfw - - - name: Cache node modules - uses: actions/cache@v3 - env: - cache-name: cache-node-modules - with: - path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - name: npm install - run: npm ci --ignore-scripts - - - name: Prepare ccache - run: ccache --clear - - - name: Cache ccache - uses: actions/cache@v3 - env: - cache-name: ccache-v1 - with: - path: ~/.ccache' - key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}-${{ github.head_ref }} - restore-keys: | - ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }} - ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }} - ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }} - - - name: Clear ccache statistics - run: | - ccache --zero-stats - ccache --max-size=2G - ccache --show-stats - - - name: Install iOS packaging dependencies - run: | - ./platform/ios/scripts/install-packaging-dependencies.sh - env: - CILAUNCH: true + run: npm ci --ignore-scripts - name: Build, package, and upload iOS release run: platform/ios/scripts/deploy-swift-package.sh diff --git a/platform/ios/scripts/install-packaging-dependencies.sh b/platform/ios/scripts/install-packaging-dependencies.sh deleted file mode 100644 index 86ed871bd..000000000 --- a/platform/ios/scripts/install-packaging-dependencies.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -COCOAPODS_VERSION="1.7.5" -JAZZY_VERSION="0.11.1" -CILAUNCH=${CILAUNCH:-false} - -function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } -function finish { >&2 echo -en "\033[0m"; } -trap finish EXIT - -step "Installing packaging dependencies…" - -## -## aws -## -if [ -z `which aws` ]; then - brew install awscli -else - echo "Found awscli" -fi - -step "Finished installing packaging dependencies"