diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml new file mode 100644 index 00000000..01bf0281 --- /dev/null +++ b/.github/workflows/deployment.yaml @@ -0,0 +1,67 @@ +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions + +name: Userscripts deployment +on: + release: + types: [published] # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release +jobs: + Deployment: + strategy: + matrix: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs + platform: [mac, ios] + runs-on: macos-latest # https://github.com/actions/runner-images + steps: + - uses: actions/checkout@v4 # https://github.com/actions/checkout + with: + fetch-depth: 0 + fetch-tags: true # https://github.com/actions/checkout/issues/1781 + - uses: actions/setup-node@v4 # https://github.com/actions/setup-node + with: + node-version: latest + - id: semver # Parse semver from github ref + uses: userscriptsup/actions/semver-parser@main + - name: Verify release type + run: | + if ${{ github.event.release.prerelease }}; then + ${{ steps.semver.outputs.beta }} || exit 11 + else + ${{ steps.semver.outputs.alpha }} && exit 12 + ${{ steps.semver.outputs.beta }} && exit 13 + [ -n "${{ steps.semver.outputs.prerelease }}" ] && exit 14 + exit 0 + fi + - run: npm install + - run: npm run lint:js + - run: npm run lint:css + - run: npm run build:${{ matrix.platform }}-beta + if: ${{ github.event.release.prerelease }} + - run: npm run build:${{ matrix.platform }} + if: ${{ ! github.event.release.prerelease }} + - name: Set xcode version + run: sudo xcode-select -s "/Applications/Xcode_15.4.app" # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md#xcode + - name: Run fastlane + working-directory: ./fastlane + env: + FASTLANE_OPT_OUT_USAGE: "YES" + MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }} + MATCH_GIT_PRIVATE_KEY: "fastlane/${{ secrets.GIT_PRIVATE_KEY_FILE }}" + GIT_PRIVATE_KEY_FILE: ${{ secrets.GIT_PRIVATE_KEY_FILE }} + GIT_PRIVATE_KEY_BASE64: ${{ secrets.GIT_PRIVATE_KEY_BASE64 }} # https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#storing-base64-binary-blobs-as-secrets + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + GYM_INSTALLER_CERT_NAME: ${{ secrets.GYM_INSTALLER_CERT_NAME }} # required for mac (unable to auto-detect) + APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }} + APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }} + APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }} + MARKETING_VERSION: ${{ steps.semver.outputs.core }} + IS_PRERELEASE: ${{ github.event.release.prerelease }} + run: | + echo $GIT_PRIVATE_KEY_BASE64 | base64 --decode > $GIT_PRIVATE_KEY_FILE + chmod 600 $GIT_PRIVATE_KEY_FILE + bundle install + $IS_PRERELEASE && bundle exec fastlane ${{ matrix.platform }} beta + $IS_PRERELEASE || bundle exec fastlane ${{ matrix.platform }} release + - name: Artifact dSYM + uses: actions/upload-artifact@v4 # https://github.com/actions/upload-artifact + with: + name: Userscripts_${{ matrix.platform }}_${{ github.ref_name }}.app.dSYM + path: build/*.dSYM.zip diff --git a/.gitignore b/.gitignore index ded7b2f9..6e9c9304 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,8 @@ xcode/Ext-Safari/Resources/ # directories and files local *.local -/scripts/*.local.js \ No newline at end of file +/scripts/*.local.js + +# fastlane +/fastlane/report.xml +/fastlane/**/*.local.rb \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 24436b8d..892bfd4d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,7 +16,6 @@ "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, // https://github.com/microsoft/vscode-eslint#settings-options "eslint.validate": ["javascript", "svelte"], - "eslint.experimental.useFlatConfig": true, // https://github.com/stylelint/vscode-stylelint#stylelintvalidate "stylelint.validate": ["css", "postcss", "svelte"] } diff --git a/Userscripts.code-workspace b/Userscripts.code-workspace new file mode 100644 index 00000000..a0b39827 --- /dev/null +++ b/Userscripts.code-workspace @@ -0,0 +1,14 @@ +// https://code.visualstudio.com/docs/editor/workspaces +{ + "folders": [ + { + "name": "Userscripts-JS", + "path": "." + }, + { + "name": "Userscripts-Xcode", + "path": "xcode" + } + ], + "settings": {} +} diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 00000000..86b5e78c --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,4 @@ +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile + +app_identifier("com.userscripts.macos") diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 00000000..1b3f158f --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,75 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools + +LOCAL_FASTFILE = "local/Fastfile.local.rb" +if File.file?(LOCAL_FASTFILE) + import(LOCAL_FASTFILE) +end + +PROJECT_PATH = "xcode/Userscripts.xcodeproj" + +# https://docs.fastlane.tools/actions/is_ci/ +if is_ci + setup_ci + IS_CI = true +else + IS_CI = false +end + +# https://docs.fastlane.tools/actions/app_store_connect_api_key/ +app_store_connect_api_key( + key_id: ENV['APP_STORE_CONNECT_API_KEY_KEY_ID'], + issuer_id: ENV['APP_STORE_CONNECT_API_KEY_ISSUER_ID'], + key_content: ENV['APP_STORE_CONNECT_API_KEY_KEY'], + key_filepath: ENV['APP_STORE_CONNECT_API_KEY_KEY_FILEPATH'], +) + +default_platform(:ios) + +platform :ios do + lane :beta do + match + BUILD_NUMBER = latest_testflight_build_number(platform: "ios") + 1 + build_app( + project: PROJECT_PATH, + scheme: "iOS", + xcargs: { + CURRENT_PROJECT_VERSION: BUILD_NUMBER.to_s, + MARKETING_VERSION: ENV['MARKETING_VERSION'], + }, + output_directory: "build", + output_name: "Userscripts-iOS-Beta", + silent: IS_CI, + ) + upload_to_testflight(skip_submission: true) + end + + lane :release do + puts "ios release #{ENV['MARKETING_VERSION']}" + beta + end +end + +platform :mac do + lane :beta do + match + BUILD_NUMBER = latest_testflight_build_number(platform: "osx") + 1 + build_mac_app( + project: PROJECT_PATH, + scheme: "Mac", + xcargs: { + CURRENT_PROJECT_VERSION: BUILD_NUMBER.to_s, + MARKETING_VERSION: ENV['MARKETING_VERSION'], + }, + output_directory: "build", + output_name: "Userscripts-Mac-Beta", + silent: IS_CI, + ) + upload_to_testflight(skip_submission: true) + end + + lane :release do + puts "mac release #{ENV['MARKETING_VERSION']}" + beta + end +end \ No newline at end of file diff --git a/fastlane/Gemfile b/fastlane/Gemfile new file mode 100644 index 00000000..a4353219 --- /dev/null +++ b/fastlane/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "fastlane" +# gem "rubocop" diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock new file mode 100644 index 00000000..9a4c9f50 --- /dev/null +++ b/fastlane/Gemfile.lock @@ -0,0 +1,220 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.950.0) + aws-sdk-core (3.201.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.156.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.8.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.110.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.221.1) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.6) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.7.2) + jwt (2.8.2) + base64 + mini_magick (4.13.1) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.3.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.5.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.0) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.9) + strscan + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + strscan (3.1.0) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.5.0) + word_wrap (1.0.0) + xcodeproj (1.24.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.5.11 diff --git a/fastlane/Matchfile b/fastlane/Matchfile new file mode 100644 index 00000000..3cbce194 --- /dev/null +++ b/fastlane/Matchfile @@ -0,0 +1,12 @@ +# https://docs.fastlane.tools/actions/match + +readonly(true) +type("appstore") +app_identifier([ + "com.userscripts.macos", + "com.userscripts.macos.Userscripts-Extension", +]) + +for_platform :mac do + additional_cert_types(["mac_installer_distribution"]) +end \ No newline at end of file diff --git a/jsconfig.json b/jsconfig.json index 2fae38f7..4c9004b8 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -22,5 +22,5 @@ "skipLibCheck": true, "sourceMap": true }, - "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] + "include": ["*.js", "src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] } diff --git a/xcode/xcconfig/Mac-App.xcconfig b/xcode/xcconfig/Mac-App.xcconfig index cce654b3..8e4e77a8 100644 --- a/xcode/xcconfig/Mac-App.xcconfig +++ b/xcode/xcconfig/Mac-App.xcconfig @@ -15,5 +15,8 @@ PRODUCT_NAME = $(PROJECT_NAME) PRODUCT_NAME[config=Debug] = $(PROJECT_NAME)-Debug PRODUCT_NAME[config=Vite] = $(PROJECT_NAME)-Vite +// Provisioning Profile +PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(APP_IDENTIFIER) macos + // Override this file #include? "Mac-App.dev.xcconfig" diff --git a/xcode/xcconfig/Mac-Safari-Extension.xcconfig b/xcode/xcconfig/Mac-Safari-Extension.xcconfig index 4b85f7c0..8e85fdbf 100644 --- a/xcode/xcconfig/Mac-Safari-Extension.xcconfig +++ b/xcode/xcconfig/Mac-Safari-Extension.xcconfig @@ -12,5 +12,8 @@ PRODUCT_BUNDLE_IDENTIFIER = $(EXT_IDENTIFIER) PRODUCT_NAME = $(PROJECT_NAME)-$(TARGET_NAME) SKIP_INSTALL = YES +// Provisioning Profile +PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(EXT_IDENTIFIER) macos + // Override this file #include? "Mac-Safari-Extension.dev.xcconfig" diff --git a/xcode/xcconfig/Userscripts-Release.xcconfig b/xcode/xcconfig/Userscripts-Release.xcconfig index f2b22000..886f5a47 100644 --- a/xcode/xcconfig/Userscripts-Release.xcconfig +++ b/xcode/xcconfig/Userscripts-Release.xcconfig @@ -1,11 +1,12 @@ #include "Userscripts-Base.xcconfig" INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2018–2024 Justin Wasack. All rights reserved. -CURRENT_PROJECT_VERSION = 88 -MARKETING_VERSION = 4.5.0 +CURRENT_PROJECT_VERSION = 1 +MARKETING_VERSION = 1.0.0 -// Development -CODE_SIGN_IDENTITY = Apple Development +// Distribution +CODE_SIGN_STYLE = Manual +CODE_SIGN_IDENTITY = Apple Distribution // Developer Team ID DEVELOPMENT_TEAM = J74Q8V8V8N // Organization Identifier diff --git a/xcode/xcconfig/iOS-App.xcconfig b/xcode/xcconfig/iOS-App.xcconfig index b6037e3e..961b978c 100644 --- a/xcode/xcconfig/iOS-App.xcconfig +++ b/xcode/xcconfig/iOS-App.xcconfig @@ -26,5 +26,8 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO TARGETED_DEVICE_FAMILY = 1,2 VALIDATE_PRODUCT[config=Release] = YES +// Provisioning Profile +PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(APP_IDENTIFIER) + // Override this file #include? "iOS-App.dev.xcconfig" diff --git a/xcode/xcconfig/iOS-Safari-Extension.xcconfig b/xcode/xcconfig/iOS-Safari-Extension.xcconfig index 7b8259d4..77d561ab 100644 --- a/xcode/xcconfig/iOS-Safari-Extension.xcconfig +++ b/xcode/xcconfig/iOS-Safari-Extension.xcconfig @@ -16,5 +16,8 @@ SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 1,2 VALIDATE_PRODUCT[config=Release] = YES +// Provisioning Profile +PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(EXT_IDENTIFIER) + // Override this file #include? "iOS-Safari-Extension.dev.xcconfig"