diff --git a/.github/scripts/signing.sh b/.github/scripts/signing.sh deleted file mode 100755 index b4799e5..0000000 --- a/.github/scripts/signing.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Import certificate and private key -echo $SIGNING_DATA | base64 -d -o Signing.p12 -security create-keychain -p ci ci.keychain -security default-keychain -s ci.keychain -security list-keychains -s ci.keychain -security import ./Signing.p12 -k ci.keychain -P $SIGNING_PASSWORD -A -security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ci ci.keychain - -# Import Profiles -mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles -echo $HOST_PROFILE_DATA | base64 -d -o Host.provisionprofile -HOST_UUID=`grep UUID -A1 -a Host.provisionprofile | grep -io "[-A-F0-9]\{36\}"` -cp Host.provisionprofile ~/Library/MobileDevice/Provisioning\ Profiles/$HOST_UUID.provisionprofile -echo $AGENT_PROFILE_DATA | base64 -d -o Agent.provisionprofile -AGENT_UUID=`grep UUID -A1 -a Agent.provisionprofile | grep -io "[-A-F0-9]\{36\}"` -cp Agent.provisionprofile ~/Library/MobileDevice/Provisioning\ Profiles/$AGENT_UUID.provisionprofile - -# Create directories for ASC key -mkdir ~/.private_keys -echo -n "$APPLE_API_KEY_DATA" > ~/.private_keys/AuthKey_$APPLE_API_KEY_ID.p8 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9bf7a43..d3a19d0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -5,7 +5,7 @@ on: - cron: "0 8 * * *" jobs: build: - runs-on: macos-11.0 + runs-on: macos-12.0 timeout-minutes: 10 steps: - uses: actions/checkout@v2 @@ -19,7 +19,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} run: ./.github/scripts/signing.sh - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_13.2.1.app + run: sudo xcrun xcode-select -s /Applications/Xcode_14.1.app - name: Update Build Number env: RUN_ID: ${{ github.run_id }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6beba2..ba73ac6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,10 +6,10 @@ on: - '*' jobs: test: - runs-on: macos-11.0 + runs-on: macos-12.0 timeout-minutes: 10 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Setup Signing env: SIGNING_DATA: ${{ secrets.SIGNING_DATA }} @@ -20,7 +20,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} run: ./.github/scripts/signing.sh - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_13.2.1.app + run: sudo xcrun xcode-select -s /Applications/Xcode_14.1.app - name: Test run: | pushd Sources/Packages @@ -30,7 +30,7 @@ jobs: runs-on: macos-11.0 timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Signing env: SIGNING_DATA: ${{ secrets.SIGNING_DATA }} @@ -41,7 +41,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} run: ./.github/scripts/signing.sh - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_13.2.1.app + run: sudo xcrun xcode-select -s /Applications/Xcode_14.1.app - name: Update Build Number env: TAG_NAME: ${{ github.ref }} @@ -53,6 +53,8 @@ jobs: sed -i '' -e "s/GITHUB_BUILD_URL/https:\/\/github.com\/maxgoedjen\/secretive\/actions\/runs\/$RUN_ID/g" Sources/Secretive/Credits.rtf - name: Build run: xcrun xcodebuild -project Sources/Secretive.xcodeproj -scheme Secretive -configuration Release -archivePath Archive.xcarchive archive + - name: Export Products + run: xcrun xcodebuild -exportArchive -archivePath Archive.xcarchive -exportOptionsPlist Sources/Secretive/ExportOptions.plist -allowProvisioningUpdates -authenticationKeyIssuerID $APPLE_API_ISSUER -authenticationKeyID $APPLE_API_KEY_ID -authenticationKeyPath ~/.private_keys/AuthKey_$APPLE_API_KEY_ID.p8 - name: Create ZIPs run: | ditto -c -k --sequesterRsrc --keepParent Archive.xcarchive/Products/Applications/Secretive.app ./Secretive.zip diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c21d0c5..3391039 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Test on: [push, pull_request] jobs: test: - runs-on: macos-11.0 + runs-on: macos-12.0 timeout-minutes: 10 steps: - uses: actions/checkout@v2