diff --git a/.cirrus.yml b/.cirrus.yml index f3f7f80..7622032 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,74 +1,8 @@ use_compute_credits: true -task: - name: Test - alias: test - persistent_worker: - labels: - name: dev-mini - resources: - tart-vms: 1 - build_script: - - swift build - test_script: - # Add /usr/sbin to PATH, otherwise testDiskutilInfo() fails to locate "diskutil" - - export PATH=$PATH:/usr/sbin - - swift test - integration_test_script: - - codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/debug/tart - - export PATH=$(pwd)/.build/arm64-apple-macosx/debug:$PATH - # Run integration tests - - cd integration-tests - - python3 -m venv --symlinks venv - - source venv/bin/activate - - pip install -r requirements.txt - - pytest --verbose --junit-xml=pytest-junit.xml - - go test -v ./... - pytest_junit_result_artifacts: - path: "integration-tests/pytest-junit.xml" - format: junit - -task: - name: Markdown Lint - only_if: $CIRRUS_BRANCH != 'gh-pages' && changesInclude('**.md') - container: - image: node:latest - install_script: npm install -g markdownlint-cli - lint_script: markdownlint --config=docs/.markdownlint.yml docs/ - -task: - name: Lint - alias: lint - macos_instance: - image: ghcr.io/cirruslabs/macos-runner:tahoe - lint_script: - - swift package plugin --allow-writing-to-package-directory swiftformat --cache ignore --lint --report swiftformat.json . - always: - swiftformat_report_artifacts: - path: swiftformat.json - format: swiftformat - -task: - only_if: $CIRRUS_TAG == '' - env: - matrix: - BUILD_ARCH: arm64 - BUILD_ARCH: x86_64 - name: Build ($BUILD_ARCH) - alias: build - macos_instance: - image: ghcr.io/cirruslabs/macos-runner:tahoe - build_script: swift build --arch $BUILD_ARCH --product tart - sign_script: codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/$BUILD_ARCH-apple-macosx/debug/tart - binary_artifacts: - path: .build/$BUILD_ARCH-apple-macosx/debug/tart - task: only_if: $CIRRUS_TAG == '' && ($CIRRUS_USER_PERMISSION == 'write' || $CIRRUS_USER_PERMISSION == 'admin') name: Release (Dry Run) - depends_on: - - lint - - build macos_instance: image: ghcr.io/cirruslabs/macos-runner:tahoe env: @@ -97,68 +31,3 @@ task: always: dist_artifacts: path: "dist/*" - -task: - name: Release - only_if: $CIRRUS_TAG != '' - depends_on: - - lint - - test - - build - macos_instance: - image: ghcr.io/cirruslabs/macos-runner:tahoe - env: - MACOS_CERTIFICATE: ENCRYPTED[552b9d275d1c2bdbc1bff778b104a8f9a53cbd0d59344d4b7f6d0ca3c811a5cefb97bef9ba0ef31c219cb07bdacdd2c2] - AC_PASSWORD: ENCRYPTED[4a761023e7e06fe2eb350c8b6e8e7ca961af193cb9ba47605f25f1d353abc3142606f412e405be48fd897a78787ea8c2] - GITHUB_TOKEN: ENCRYPTED[!98ace8259c6024da912c14d5a3c5c6aac186890a8d4819fad78f3e0c41a4e0cd3a2537dd6e91493952fb056fa434be7c!] - GORELEASER_KEY: ENCRYPTED[!9b80b6ef684ceaf40edd4c7af93014ee156c8aba7e6e5795f41c482729887b5c31f36b651491d790f1f668670888d9fd!] - SENTRY_ORG: cirrus-labs - SENTRY_PROJECT: persistent-workers - SENTRY_AUTH_TOKEN: ENCRYPTED[!9eaf2875d51b113e2f68598441ff8e6b2e53242e48fcb93633bd75a373fbe2e7caa900d837cc92f0b142b65579731644!] - setup_script: - - cd $HOME - - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 - - security create-keychain -p password101 build.keychain - - security default-keychain -s build.keychain - - security unlock-keychain -p password101 build.keychain - - security import certificate.p12 -k build.keychain -P password101 -T /usr/bin/codesign -T /usr/bin/pkgbuild - - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k password101 build.keychain - - xcrun notarytool store-credentials "notarytool" --apple-id "hello@cirruslabs.org" --team-id "9M2P8L4D89" --password $AC_PASSWORD - install_script: - - brew install go getsentry/tools/sentry-cli - - brew install mitchellh/gon/gon - - brew install --cask goreleaser/tap/goreleaser-pro - info_script: - - security find-identity -v - - xcodebuild -version - - swift -version - release_script: goreleaser - upload_sentry_debug_files_script: - - cd .build/arm64-apple-macosx/release/ - # Generate and upload symbols - - dsymutil tart - - sentry-cli debug-files upload tart.dSYM/ - - SENTRY_PROJECT=tart sentry-cli debug-files upload tart.dSYM/ - # Bundle and upload sources - - sentry-cli debug-files bundle-sources tart.dSYM - - sentry-cli debug-files upload tart.src.zip - - SENTRY_PROJECT=tart sentry-cli debug-files upload tart.src.zip - create_sentry_release_script: - - export SENTRY_RELEASE="tart@$CIRRUS_TAG" - - sentry-cli releases new $SENTRY_RELEASE - - sentry-cli releases set-commits $SENTRY_RELEASE --auto - - sentry-cli releases finalize $SENTRY_RELEASE - -task: - name: Deploy Documentation - only_if: $CIRRUS_BRANCH == 'main' - container: - image: ghcr.io/squidfunk/mkdocs-material:latest - registry_config: ENCRYPTED[!cf1a0f25325aa75bad3ce6ebc890bc53eb0044c02efa70d8cefb83ba9766275a994b4831706c52630a0692b2fa9cfb9e!] - env: - DEPLOY_TOKEN: ENCRYPTED[!45ed45666558902ed1c2400add734ec063103bec31841847e8c8764802fca229bfa6d85c690e16ad159e047574b48793!] - deploy_script: - - git config --global user.name "Cirrus CI" - - git config --global user.name "hello@cirruslabs.org" - - git remote set-url origin https://$DEPLOY_TOKEN@github.com/cirruslabs/tart/ - - mkdocs --verbose gh-deploy --force --remote-branch gh-pages diff --git a/.goreleaser.yml b/.goreleaser.yml index 2326b63..76fd751 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -25,20 +25,26 @@ universal_binaries: - name_template: tart.app/Contents/MacOS/tart replace: true hooks: - post: gon gon.hcl + post: + - mkdir -p dist/tart_darwin_all/tart.app/Contents/Resources + - cp Resources/embedded.provisionprofile dist/tart_darwin_all/tart.app/Contents/ + - cp Resources/Info.plist dist/tart_darwin_all/tart.app/Contents/ + - cp "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" dist/tart_darwin_all/tart.app/Contents/Resources/ + - gon gon.hcl archives: - name_template: "{{ .ProjectName }}" files: - - src: Resources/embedded.provisionprofile - dst: tart.app/Contents - strip_parent: true - - src: Resources/Info.plist - dst: tart.app/Contents - strip_parent: true - - src: Resources/AppIcon.png - dst: tart.app/Contents/Resources - strip_parent: true + - src: dist/tart_darwin_all/tart.app/Contents/Info.plist + dst: tart.app/Contents/Info.plist + - src: dist/tart_darwin_all/tart.app/Contents/embedded.provisionprofile + dst: tart.app/Contents/embedded.provisionprofile + - src: dist/tart_darwin_all/tart.app/Contents/Resources/UPW Tart.icns + dst: tart.app/Contents/Resources/UPW Tart.icns + - src: dist/tart_darwin_all/tart.app/Contents/Resources/Assets.car + dst: tart.app/Contents/Resources/Assets.car + - src: dist/tart_darwin_all/tart.app/Contents/_CodeSignature/CodeResources + dst: tart.app/Contents/_CodeSignature/CodeResources - LICENSE release: diff --git a/Resources/AppIcon.png b/Resources/AppIcon.png deleted file mode 100644 index 5ef123b..0000000 Binary files a/Resources/AppIcon.png and /dev/null differ diff --git a/Resources/Info.plist b/Resources/Info.plist index fd682e1..df4558b 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -7,15 +7,17 @@ CFBundleDisplayName Tart CFBundleIdentifier - org.cirruslabs.tart + com.github.cirruslabs.tart CFBundleExecutable tart - LSApplicationCategoryType - public.app-category.developer-tools - CFBundleIconFiles - - AppIcon.png - + CFBundlePackageType + APPL + LSApplicationCategoryType + public.app-category.developer-tools + CFBundleIconFile + UPW Tart + CFBundleIconName + UPW Tart NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/Resources/UPW Tart.icon/Assets/1.1-–-layer.png b/Resources/UPW Tart.icon/Assets/1.1-–-layer.png new file mode 100644 index 0000000..6dfddc4 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/1.1-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/2.2-–-layer.png b/Resources/UPW Tart.icon/Assets/2.2-–-layer.png new file mode 100644 index 0000000..98a447e Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/2.2-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/3.3-–-layer.png b/Resources/UPW Tart.icon/Assets/3.3-–-layer.png new file mode 100644 index 0000000..c205f3a Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/3.3-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/4.4-–-layer.png b/Resources/UPW Tart.icon/Assets/4.4-–-layer.png new file mode 100644 index 0000000..726d693 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/4.4-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L1.png b/Resources/UPW Tart.icon/Assets/UPW Tart L1.png new file mode 100644 index 0000000..6dfddc4 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L1.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L2.png b/Resources/UPW Tart.icon/Assets/UPW Tart L2.png new file mode 100644 index 0000000..98a447e Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L2.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L3.png b/Resources/UPW Tart.icon/Assets/UPW Tart L3.png new file mode 100644 index 0000000..03b6669 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L3.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L4.png b/Resources/UPW Tart.icon/Assets/UPW Tart L4.png new file mode 100644 index 0000000..1a93ee9 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L4.png differ diff --git a/Resources/UPW Tart.icon/icon.json b/Resources/UPW Tart.icon/icon.json new file mode 100644 index 0000000..57156ab --- /dev/null +++ b/Resources/UPW Tart.icon/icon.json @@ -0,0 +1,140 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "blend-mode" : "normal", + "blur-material" : 0.5, + "layers" : [ + { + "hidden" : false, + "image-name-specializations" : [ + { + "value" : "4.4-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L4.png" + } + ], + "name" : "UPW Tart L4" + } + ], + "opacity" : 1, + "shadow" : { + "kind" : "neutral", + "opacity" : 1 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + }, + { + "layers" : [ + { + "image-name-specializations" : [ + { + "value" : "3.3-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L3.png" + } + ], + "name" : "UPW Tart L3", + "position-specializations" : [ + { + "idiom" : "square", + "value" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ] + } + ], + "shadow" : { + "kind" : "none", + "opacity" : 1 + }, + "specular" : false, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + }, + { + "blur-material" : null, + "layers" : [ + { + "image-name-specializations" : [ + { + "value" : "2.2-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L2.png" + } + ], + "name" : "UPW Tart L2" + } + ], + "position-specializations" : [ + { + "idiom" : "square", + "value" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "none", + "opacity" : 1 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + }, + { + "layers" : [ + { + "image-name-specializations" : [ + { + "value" : "1.1-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L1.png" + } + ], + "name" : "UPW Tart L1" + } + ], + "shadow" : { + "kind" : "layer-color", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/Resources/actool/Assets.car b/Resources/actool/Assets.car new file mode 100644 index 0000000..0516371 Binary files /dev/null and b/Resources/actool/Assets.car differ diff --git a/Resources/actool/Info.plist b/Resources/actool/Info.plist new file mode 100644 index 0000000..cd9f223 --- /dev/null +++ b/Resources/actool/Info.plist @@ -0,0 +1,10 @@ + + + + + CFBundleIconFile + UPW Tart + CFBundleIconName + UPW Tart + + diff --git a/Resources/actool/UPW Tart.icns b/Resources/actool/UPW Tart.icns new file mode 100644 index 0000000..4bf10fe Binary files /dev/null and b/Resources/actool/UPW Tart.icns differ diff --git a/actool.sh b/actool.sh new file mode 100755 index 0000000..a12ad94 --- /dev/null +++ b/actool.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Set shell options to enable fail-fast behavior +# +# * -e: fail the script when an error occurs or command fails +# * -u: fail the script when attempting to reference unset parameters +# * -o pipefail: by default an exit status of a pipeline is that of its +# last command, this fails the pipe early if an error in +# any of its commands occurs +# +set -euo pipefail + +OUTPUT_PATH="Resources/actool" +PLIST_PATH="$OUTPUT_PATH/Info.plist" + +rm -rf "${OUTPUT_PATH}" +mkdir -p "${OUTPUT_PATH}" + +actool "Resources/UPW Tart.icon" \ + --compile "${OUTPUT_PATH}" \ + --output-format human-readable-text \ + --notices \ + --warnings \ + --errors \ + --app-icon "UPW Tart" \ + --output-partial-info-plist $PLIST_PATH \ + --include-all-app-icons \ + --target-device mac \ + --minimum-deployment-target 13.0 \ + --platform macosx diff --git a/gon.hcl b/gon.hcl index 461d2aa..6d01549 100644 --- a/gon.hcl +++ b/gon.hcl @@ -1,4 +1,4 @@ -source = [ "dist/tart_darwin_all/tart.app/Contents/MacOS/tart" ] +source = [ "dist/tart_darwin_all/tart.app" ] bundle_id = "com.github.cirruslabs.tart" apple_id { diff --git a/scripts/run-signed.sh b/scripts/run-signed.sh index 2090037..4baf178 100755 --- a/scripts/run-signed.sh +++ b/scripts/run-signed.sh @@ -6,13 +6,14 @@ set -e swift build --product tart -codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/debug/tart rm -Rf .build/tart.app/ mkdir -p .build/tart.app/Contents/MacOS .build/tart.app/Contents/Resources cp -c .build/debug/tart .build/tart.app/Contents/MacOS/tart cp -c Resources/embedded.provisionprofile .build/tart.app/Contents/embedded.provisionprofile cp -c Resources/Info.plist .build/tart.app/Contents/Info.plist -cp -c Resources/AppIcon.png .build/tart.app/Contents/Resources +cp -c "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" .build/tart.app/Contents/Resources/ + +codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/tart.app .build/tart.app/Contents/MacOS/tart "$@"