diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4d2a7482..ec8f9b8b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -21,7 +21,7 @@ jobs: # Force all run commands to not use Rosetta 2 shell: arch -arm64 /bin/zsh -Negku {0} steps: - - name: Checkout + - name: ๐Ÿ›’ Checkout repo env: GIT_CONFIG_COUNT: 1 GIT_CONFIG_KEY_0: init.defaultBranch @@ -31,17 +31,20 @@ jobs: # Include all history & tags for script/version fetch-depth: 0 - - name: Setup repo + - name: ๐Ÿ”ง Setup repo run: script/setup_workflow_repo - - name: Bootstrap + - name: ๐Ÿ›  Select Xcode 16.2 + run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer + + - name: ๐Ÿ‘ข Bootstrap run: script/bootstrap - - name: Build + - name: ๐Ÿ— Build run: script/build build-test - - name: Test + - name: ๐Ÿงช Test run: script/test - - name: Lint + - name: ๐Ÿšจ Lint run: script/lint diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 72d50bdc..11a847fd 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -27,7 +27,7 @@ jobs: - language: swift build-mode: manual steps: - - name: Checkout repository + - name: ๐Ÿ›’ Checkout repo env: GIT_CONFIG_COUNT: 1 GIT_CONFIG_KEY_0: init.defaultBranch @@ -37,23 +37,23 @@ jobs: # Include all history & tags for script/version fetch-depth: 0 - - name: Setup repo + - name: ๐Ÿ”ง Setup repo run: script/setup_workflow_repo - - name: Initialize CodeQL + - name: ๐Ÿ”ฉ Initialize CodeQL uses: github/codeql-action/init@v3 with: languages: ${{matrix.language}} build-mode: ${{matrix.build-mode}} queries: ${{matrix.language == 'swift' && '+security-and-quality' || ''}} - - name: Build Swift + - name: ๐Ÿ— Build Swift if: matrix.language == 'swift' shell: bash run: | script/build codeql - - name: Perform CodeQL Analysis + - name: ๐Ÿ” Perform CodeQL analysis uses: github/codeql-action/analyze@v3 with: category: /language:${{matrix.language}} diff --git a/.github/workflows/tag-pushed.yml b/.github/workflows/tag-pushed.yml index 324bafe5..5d26d60f 100644 --- a/.github/workflows/tag-pushed.yml +++ b/.github/workflows/tag-pushed.yml @@ -60,10 +60,11 @@ jobs: exit 3 fi + - name: ๐Ÿ›  Select Xcode 16.2 + run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer + - name: ๐Ÿ“ฆ Build universal executable & package it in an installer - run: | - sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer - script/package package + run: script/package package - name: ๐Ÿšฐ Bump custom tap formula env: diff --git a/.swiftlint.yml b/.swiftlint.yml index 41053793..f941a142 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -13,6 +13,7 @@ disabled_rules: # eventually enable - file_header - one_declaration_per_file + - prefer_key_path - trailing_comma # never enable - contrasted_opening_brace diff --git a/README.md b/README.md index ee463c8f..29f3d63a 100644 --- a/README.md +++ b/README.md @@ -308,7 +308,7 @@ If mas doesn't work for you as expected (e.g. you can't install/upgrade apps), r If the issue persists, please [file a bug](/~https://github.com/mas-cli/mas/issues/new). All feedback is much appreciated! โœจ -## โ„น๏ธ Build from source +## ๐Ÿ— Build from source You can build from Xcode by opening the root mas directory, or from the Terminal: @@ -318,7 +318,7 @@ script/build Build output can be found in the `.build` directory within the project. -## โœ… Tests +## ๐Ÿงช Tests Tests are written using [Quick](/~https://github.com/Quick/Quick) & [Nimble](/~https://github.com/Quick/Nimble). diff --git a/script/clean b/script/clean index b5af491c..c80ba5f0 100755 --- a/script/clean +++ b/script/clean @@ -3,11 +3,13 @@ # script/clean # mas # -# Deletes the build directory. +# Deletes the build directory & other generated files. # . "${0:a:h}/_setup_script" +printf $'==> ๐Ÿ—‘ Cleaning mas %s\n' "$(script/version)" + swift package clean swift package reset rm -f Sources/mas/Package.swift diff --git a/script/format b/script/format index db5fb8d3..46673794 100755 --- a/script/format +++ b/script/format @@ -10,7 +10,7 @@ . "${0:a:h}/_setup_script" -printf $'==> ๐Ÿšจ Formatting mas %s\n' "$(script/version)" +printf $'==> ๐Ÿงน Formatting mas %s\n' "$(script/version)" for formatter in markdownlint prettier swift-format swiftformat swiftlint yamllint; do if ! command -v "${formatter}" >/dev/null; then diff --git a/script/test b/script/test index 2b2414f4..1674102c 100755 --- a/script/test +++ b/script/test @@ -8,7 +8,7 @@ . "${0:a:h}/_setup_script" -printf $'==> โœ… Testing mas %s\n' "$(script/version)" +printf $'==> ๐Ÿงช Testing mas %s\n' "$(script/version)" script/generate_package_swift test