Enable specifying a tag/branch in the skip-source input for a source build of skip (#14)

* Enable specifying a tag/branch in the skip-source input for a source build of skip

* Ensure we install swiftly even when building skip from source

* Update actions

* Update actions

* Add back debug logging for skip export

* Update actions

* Update actions

* Update actions and runner to use macos-26

* Update to use skip v1

Author: marcprux

.github/workflows/ci.yml

@@ -10,13 +10,13 @@ jobs:
       fail-fast: false
       matrix:
         os: ['macos-latest', 'ubuntu-latest']
-        brew-source: ['formula', 'cask']
+        skip-source: ['formula', 'cask', 'main']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
       - uses: ./setup-skip
         with:
-          skip-source: ${{ matrix.brew-source }}
+          skip-source: ${{ matrix.skip-source }}
       - run: skip doctor
       - run: skip android sdk install --verbose
       - run: skip checkup

.github/workflows/skip-app.yml

@@ -33,6 +33,9 @@ on:
       brew-install:
         required: false
         type: string
+      skip-source:
+        required: false
+        type: string
       run-local-tests:
         required: false
         type: boolean
@@ -54,14 +57,15 @@ on:
         required: false
 jobs:
   skip-app:
-    runs-on: macos-15-intel
+    runs-on: macos-26
     timeout-minutes: 180
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
     steps:
       - uses: actions/checkout@v6
         with:
           submodules: 'recursive'
+          # need to fetch tags to be able to update the version in Skip.env
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: "Setup"
         id: setup
@@ -109,19 +113,32 @@ jobs:
       - uses: skiptools/actions/setup-skip@v1
         with:
           verify-project: '.'
+          skip-source: '${{ inputs.skip-source }}'
           install-swift-android-sdk: ${{ steps.setup.outputs.skip-fuse }}
 
       - name: "Run Tests"
         if: ${{ inputs.run-local-tests == true && ! startsWith(github.ref, 'refs/tags/') }}
         run: test ! -d Tests || skip test
 
+      - name: "Create Android debug keystore"
+        run: |
+          if [ ! -f ~/.android/debug.keystore ]; then
+            mkdir -p ~/.android
+            keytool -genkeypair -v -keystore ~/.android/debug.keystore \
+              -alias androiddebugkey -keyalg RSA -keysize 2048 -validity 10000 \
+              -storepass android -keypass android \
+              -dname "CN=Android Debug,O=Android,C=US"
+          fi
+
       - name: "Export project"
         run: |
-          # need to run twice due to a bug with debug key availability
-          skip export -v --debug -d skip-export --show-tree --summary-file=$GITHUB_STEP_SUMMARY
-          skip export -v --release -d skip-export --show-tree --summary-file=$GITHUB_STEP_SUMMARY
+          skip export -d skip-export --verbose --release --appindex --show-tree --summary-file=$GITHUB_STEP_SUMMARY
           cp -a Package.resolved skip-export/
 
+      - name: "Validate appindex.json"
+        run: |
+          cat skip-export/appindex.json | jq .
+
       - name: "Setup Android App Signing"
         if: ${{ env.KEYSTORE_PROPERTIES != '' }}
         env:

.github/workflows/skip-framework.yml

@@ -39,6 +39,9 @@ on:
       brew-install:
         required: false
         type: string
+      skip-source:
+        required: false
+        type: string
       install-swift:
         required: false
         type: string
@@ -183,6 +186,7 @@ jobs:
       - uses: skiptools/actions/setup-skip@v1
         with:
           verify-project: '.'
+          skip-source: '${{ inputs.skip-source }}'
           install-swift-android-sdk: ${{ steps.setup.outputs.skip-fuse }}
 
       - name: Install Prerequisities

README.md

@@ -31,7 +31,7 @@ steps:
 | Input | Description | Default |
 |-------|-------------|---------|
 | `skip-version` | Version of the Skip toolchain to install | `'latest'` |
-| `skip-source` | Homebrew source to install Skip from ([`formula`](https://formulae.brew.sh/formula/skip) or [`cask`](https://github.com/skiptools/homebrew-skip/blob/main/Casks/skip.rb)) | `'formula'` |
+| `skip-source` | Homebrew source to install Skip from ([`formula`](https://formulae.brew.sh/formula/skip) or [`cask`](https://github.com/skiptools/homebrew-skip/blob/main/Casks/skip.rb)) or the branch name to build from source | `'formula'` |
 | `run-doctor` | Run `skip doctor` after setup to verify the environment | `'true'` |
 | `verify-project` | Path to a project directory to verify with `skip verify` | `''` (disabled) |
 | `swift-version` | Swift toolchain version to install via `swiftly` | `''` (use pre-installed) |

setup-skip/action.yml

@@ -5,12 +5,8 @@ branding:
   color: 'blue'
 
 inputs:
-  skip-version:
-    description: 'The version of the Skip toolchain to install'
-    required: false
-    default: 'latest'
   skip-source:
-    description: 'The Homebrew source to install skip from (formula or cask)'
+    description: 'The Homebrew source to install skip from (formula or cask or branch name)'
     required: false
     default: 'formula'
   run-doctor:
@@ -66,11 +62,22 @@ runs:
         # whether to install the canonical "skip" formula
         # or the skiptools cask tap version of the tool
         #export HOMEBREW_NO_AUTO_UPDATE=1
-        if [[ "${{ inputs.skip-source }}" == "formula" ]]; then
+        if [[ "${{ inputs.skip-source }}" == "formula" || "${{ inputs.skip-source }}" == "" ]]; then
           brew install skip
-        else
+        elif [[ "${{ inputs.skip-source }}" == "cask" ]]; then
           brew tap skiptools/skip
           brew install skiptools/skip/skip
+        else
+          # otherwise checkout and build the branch name in skip-source
+          cd ${TMPDIR}
+          git clone --recurse-submodules --branch "${{ inputs.skip-source }}" https://github.com/skiptools/skipstone.git
+          swift build --package-path skipstone/
+          mv skipstone/.build/debug/SkipRunner skipstone/.build/debug/skip
+          SKIPPATH="${PWD}/skipstone/.build/debug"
+          echo "${SKIPPATH}" >> $GITHUB_PATH
+          echo "SKIP_COMMAND_OVERRIDE=${SKIPPATH}/skip" >> $GITHUB_ENV
+          cd -
+          ${SKIPPATH}/skip version
         fi
 
         if [ ${RUNNER_OS} == 'macOS' ]; then
@@ -99,7 +106,7 @@ runs:
 
     - name: Initialize swiftly
       shell: bash
-      run: swiftly init --skip-install --assume-yes
+      run: brew install swiftly && swiftly init --skip-install --assume-yes
 
     - name: Install Host Swift Toolchain
       if: ${{ inputs.swift-version != '' }}