From 2d0e2c0f2ad2b217a9ccd971a7d1293327df641c Mon Sep 17 00:00:00 2001
From: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:55:34 +0100
Subject: [PATCH] fix CI (#142)

related to failed jobs on the `nightly` branch...

## description
this PR adds a little step to show the target branch and the current
branch and fixes the logic to set the Nushell and Nupm revisions.
---
 .github/workflows/nupm-tests.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nupm-tests.yml b/.github/workflows/nupm-tests.yml
index fdcfa56..868c6b2 100644
--- a/.github/workflows/nupm-tests.yml
+++ b/.github/workflows/nupm-tests.yml
@@ -52,12 +52,29 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Setup Nushell and Nupm versions
+        shell: bash
+        run: |
+          echo "target: ${{github.base_ref}}"
+          echo "ref: ${{github.ref}}"
+
+          if [[ ${{ github.base_ref }} == 'nightly' ]]; then
+            echo "NU_VERSION='nightly'" >> $GITHUB_ENV
+            echo "NUPM_REVISION='main'" >> $GITHUB_ENV
+          elif [[ ${{ github.ref }} == 'refs/heads/nightly' ]]; then
+            echo "NU_VERSION='nightly'" >> $GITHUB_ENV
+            echo "NUPM_REVISION='main'" >> $GITHUB_ENV
+          else
+            echo "NU_VERSION=${{ inputs.nu_version }}" >> $GITHUB_ENV
+            echo "NUPM_REVISION=${{ inputs.nupm_revision }}" >> $GITHUB_ENV
+          fi
+
       - name: Setup nushell and nupm
         uses: amtoine/setup-nupm-action@0.1.1
         id: "nu-setup"
         with:
-          nu_version: ${{github.base_ref == 'nightly' && 'nightly' || inputs.nu_version}}
-          nupm_revision: ${{github.base_ref == 'nightly' && 'main' || inputs.nupm_revision}}
+          nu_version: ${{ env.NU_VERSION }}
+          nupm_revision: ${{ env.NUPM_REVISION }}
 
       - name: Set up Git
         shell: bash