diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0e6ba09c2..5c8ed0e08 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -138,86 +138,86 @@ jobs: # ------------------------------------------------------ - # Build-iOS: - # runs-on: macos-13 + Build-iOS: + runs-on: macos-13 - # env: - # QT_VERSION: 6.6.2 - # CC: cc - # CXX: c++ - # PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} - # DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} + env: + QT_VERSION: 6.6.2 + CC: cc + CXX: c++ + PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }} + DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }} - # steps: - # - name: 'Setup xcode' - # uses: maxim-lobanov/setup-xcode@v1 - # with: - # xcode-version: '15.2' + steps: + - name: 'Setup xcode' + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.2' - # - name: 'Install desktop Qt' - # uses: jurplel/install-qt-action@v3 - # with: - # version: ${{ env.QT_VERSION }} - # host: 'mac' - # target: 'desktop' - # modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia' - # arch: 'clang_64' - # dir: ${{ runner.temp }} - # set-env: 'true' - # extra: '--base ${{ env.QT_MIRROR }}' + - name: 'Install desktop Qt' + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'mac' + target: 'desktop' + modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia' + arch: 'clang_64' + dir: ${{ runner.temp }} + set-env: 'true' + extra: '--base ${{ env.QT_MIRROR }}' - # - name: 'Install iOS Qt' - # uses: jurplel/install-qt-action@v3 - # with: - # version: ${{ env.QT_VERSION }} - # host: 'mac' - # target: 'ios' - # modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia' - # dir: ${{ runner.temp }} - # setup-python: 'true' - # set-env: 'true' - # extra: '--external 7z --base ${{ env.QT_MIRROR }}' + - name: 'Install iOS Qt' + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'mac' + target: 'ios' + modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia' + dir: ${{ runner.temp }} + setup-python: 'true' + set-env: 'true' + extra: '--external 7z --base ${{ env.QT_MIRROR }}' - # - name: 'Install go' - # uses: actions/setup-go@v5 - # with: - # go-version: '1.22.1' - # cache: false + - name: 'Install go' + uses: actions/setup-go@v5 + with: + go-version: '1.22.1' + cache: false - # - name: 'Setup gomobile' - # run: | - # export PATH=$PATH:~/go/bin - # go install golang.org/x/mobile/cmd/gomobile@latest - # gomobile init + - name: 'Setup gomobile' + run: | + export PATH=$PATH:~/go/bin + go install golang.org/x/mobile/cmd/gomobile@latest + gomobile init - # - name: 'Get sources' - # uses: actions/checkout@v4 - # with: - # submodules: 'true' - # fetch-depth: 10 + - name: 'Get sources' + uses: actions/checkout@v4 + with: + submodules: 'true' + fetch-depth: 10 - # - name: 'Setup ccache' - # uses: hendrikmuhs/ccache-action@v1.2 + - name: 'Setup ccache' + uses: hendrikmuhs/ccache-action@v1.2 - # - name: 'Install dependencies' - # run: pip install jsonschema jinja2 + - name: 'Install dependencies' + run: pip install jsonschema jinja2 - # - name: 'Build project' - # run: | - # git submodule update --init --recursive - # export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin" - # export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos" - # export PATH=$PATH:~/go/bin - # sh deploy/build_ios.sh - # env: - # IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }} - # IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }} - # IOS_SIGNING_CERT_PASSWORD: ${{ secrets.IOS_SIGNING_CERT_PASSWORD }} - # APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }} - # APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }} - # APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }} - # IOS_APP_PROVISIONING_PROFILE: ${{ secrets.IOS_APP_PROVISIONING_PROFILE }} - # IOS_NE_PROVISIONING_PROFILE: ${{ secrets.IOS_NE_PROVISIONING_PROFILE }} + - name: 'Build project' + run: | + git submodule update --init --recursive + export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin" + export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos" + export PATH=$PATH:~/go/bin + sh deploy/build_ios.sh + env: + IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }} + IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }} + IOS_SIGNING_CERT_PASSWORD: ${{ secrets.IOS_SIGNING_CERT_PASSWORD }} + APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }} + APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }} + APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }} + IOS_APP_PROVISIONING_PROFILE: ${{ secrets.IOS_APP_PROVISIONING_PROFILE }} + IOS_NE_PROVISIONING_PROFILE: ${{ secrets.IOS_NE_PROVISIONING_PROFILE }} # - name: 'Upload appstore .ipa and dSYMs to artifacts' # uses: actions/upload-artifact@v4 diff --git a/deploy/build_macos_ne.sh b/deploy/build_macos_ne.sh index a1459d6ff..217b449d9 100755 --- a/deploy/build_macos_ne.sh +++ b/deploy/build_macos_ne.sh @@ -36,19 +36,19 @@ INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg # Copy provisioning profiles -mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles/" +# mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles/" -echo $MACOS_APP_PROVISIONING_PROFILE | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision -echo $MACOS_NE_PROVISIONING_PROFILE | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision +# echo $MACOS_APP_PROVISIONING_PROFILE | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision +# echo $MACOS_NE_PROVISIONING_PROFILE | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision -shasum -a 256 ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision -shasum -a 256 ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision +# shasum -a 256 ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision +# shasum -a 256 ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision -macos_app_uuid=`grep UUID -A1 -a ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision | grep -io "[-A-F0-9]\{36\}"` -macos_ne_uuid=`grep UUID -A1 -a ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision | grep -io "[-A-F0-9]\{36\}"` +# macos_app_uuid=`grep UUID -A1 -a ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision | grep -io "[-A-F0-9]\{36\}"` +# macos_ne_uuid=`grep UUID -A1 -a ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision | grep -io "[-A-F0-9]\{36\}"` -mv ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/$macos_app_uuid.mobileprovision -mv ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/$macos_ne_uuid.mobileprovision +# mv ~/Library/MobileDevice/Provisioning\ Profiles/macos_app.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/$macos_app_uuid.mobileprovision +# mv ~/Library/MobileDevice/Provisioning\ Profiles/macos_ne.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/$macos_ne_uuid.mobileprovision # Check if QIF_VERSION is properly set, otherwise set a default if [ -z "${QIF_VERSION+x}" ]; then