wip

Author: rauhul

.github/actions/install-swift/action.yml

@@ -16,8 +16,6 @@ runs:
     - name: Install Swiftly
       shell: bash
       run: |
-        UNAME=$(uname -m)
-
         export SWIFTLY_HOME_DIR="$HOME/.local/share/swiftly"
         echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> $GITHUB_ENV
         echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> $HOME/.bashrc
@@ -26,6 +24,7 @@ runs:
         echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $GITHUB_ENV
         echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $HOME/.bashrc
 
+        UNAME=$(uname -m)
         curl -O "https://download.swift.org/swiftly/linux/swiftly-$UNAME.tar.gz"
         tar zxf "swiftly-$UNAME.tar.gz"
         ./swiftly init \

.github/workflows/update-swift-version.yml

@@ -16,74 +16,66 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-    #   - name: Set up Git
-    #     run: |
-    #       git config --global user.name "github-actions"
-    #       git config --global user.email "[email protected]"
+      - name: Set up Git
+        run: |
+          git config --global user.name "github-actions"
+          git config --global user.email "[email protected]"
 
       - name: Install dependencies
         run: |
           sudo apt-get update -qq
           sudo apt-get install -y curl jq
 
-      - name: Update Swift Version
+      - name: Create or update branch
         id: latest
         run: |
-          set -ex
+          BRANCH=ci/update-swift-version
+          git checkout -B "$BRANCH"
+
           UNAME=$(uname -m)
           curl -O "https://download.swift.org/swiftly/linux/swiftly-$UNAME.tar.gz"
           tar zxf "swiftly-$UNAME.tar.gz"
-          latest=$(./swiftly list-available main-snapshot | grep main-snapshot | head -n 1 | awk '{print $1}')
+          ./swiftly init \
+            --skip-install \
+            --assume-yes \
+            --quiet-shell-followup \
+            --no-modify-profile
+          . "$HOME/.local/share/swiftly/env.sh"
+
+          latest=$(swiftly list-available main-snapshot | grep main-snapshot | head -n 1 | awk '{print $1}')
           echo -n "$latest" > .swift-version
-          git diff .swift-version
           if [[ -z "$(git status --porcelain .swift-version)" ]]; then
             echo "No changes. Exiting."
             exit 78  # neutral exit status
           fi
-          git status
 
-      - name: Create branch
-        run: |
-          BRANCH=ci/update-swift-version
-          git checkout -B "$BRANCH"
-          echo -n "${{ steps.latest.outputs.version }}" > .swift-version
           git add .swift-version
-          git commit -m "Update Swift version to ${{ steps.latest.outputs.version }}" || echo "No changes to commit"
-          git push -u origin "$BRANCH" --force
+          git commit -m "Update Swift version to $latest"
+          git push -u origin "$BRANCH"
 
-      - name: Check for existing PR
+      - name: Create or update PR
         id: find-pr
         run: |
           gh auth setup-git
-          PR_JSON=$(gh pr list --head ci/update-swift-version --state open --json number --jq '.[0]')
-          echo "pr_number=$PR_JSON" >> $GITHUB_OUTPUT
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          pr_number=$(gh pr list --head ci/update-swift-version --state open --json number --jq '.[0]')
 
-      - name: Create or update PR
-        id: pr
-        run: |
           TITLE="ci: update Swift version to ${{ steps.latest.outputs.version }}"
           BODY="This PR updates the \`.swift-version\` file to Swift ${{ steps.latest.outputs.version }}.
 
           > This PR was automatically generated."
 
-          if [ -z "${{ steps.find-pr.outputs.pr_number }}" ]; then
+          if [[ -z "$pr_number" ]]; then
             gh pr create \
               --title "$TITLE" \
               --body "$BODY" \
               --head "ci/update-swift-version" \
               --base "main"
           else
-            echo "PR already exists: #${{ steps.find-pr.outputs.pr_number }}"
-            gh pr edit ${{ steps.find-pr.outputs.pr_number }} --title "$TITLE" --body "$BODY"
+            echo "PR already exists: #$pr_number"
+            gh pr edit $pr_number --title "$TITLE" --body "$BODY"
           fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Enable auto-merge
-        if: steps.find-pr.outputs.pr_number != ''
-        run: |
-          gh pr merge ${{ steps.find-pr.outputs.pr_number }} --auto --squash
+          gh pr merge $pr_number --auto --squash
+
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}