Install on Windows (native) via Git Bash.

ghdl · Jan 16, 2025 · d53d3c8 · d53d3c8
1 parent 89e44be
commit d53d3c8
Showing 1 changed file with 22 additions and 62 deletions.
diff --git a/action.yml b/action.yml
@@ -67,16 +67,23 @@ runs:
           printf "shell=bash" >> $GITHUB_OUTPUT
         fi
 
-    - name: Update Bash on macOS
+    - name: Update 'Bash' on macOS
       if: runner.os == 'macOS'
       shell: bash
       run: |
         # Update Bash on macOS
         brew install bash
 
+    - name: Install 'jq' in Git Bash on Windows (native)
+      if: runner.os == 'Windows' && inputs.runtime == ''
+      shell: bash
+      run: |
+        printf "::group::${ANSI_LIGHT_BLUE}%s${ANSI_NOCOLOR}\n" "Download 'jq' and copy to Git Bash ..."
+        curl -L -o /usr/bin/jq.exe https://github.com/jqlang/jq/releases/latest/download/jq-win64.exe
+        printf "::endgroup::\n"
+
     - name: Download and install GHDL
       id: generic
-      if: runner.os == 'Linux' || runner.os == 'macOS' || ( runner.os == 'Windows' && inputs.runtime != '' )
       shell: ${{ steps.shell.outputs.shell }}
       run: |
         # Download and install GHDL
@@ -127,8 +134,10 @@ runs:
             printf "::group::${ANSI_LIGHT_BLUE}%s${ANSI_NOCOLOR}\n" "Installing 'jq' file ..."
             pacman -S --noconfirm ucrt64/mingw-w64-ucrt-x86_64-jq
             printf "::endgroup::\n"
+          elif [[ "${{ inputs.runtime }}" == "" ]]; then
+            osRuntime="native"
           else
-            printf "::error title=%s::%s\n" "setup-ghdl" "Unsupported MSYS 2 runtime '${{ inputs.runtime }}'."
+            printf "::error title=%s::%s\n" "setup-ghdl" "Unsupported MSYS2 runtime '${{ inputs.runtime }}'."
             exit 1
           fi
 
@@ -238,7 +247,7 @@ runs:
         downloadBase="$(jq -r '.meta."release-url"' inventory.json)"
         downloadFile="$(jq -r ".files.ghdl.\"${osName,,}\".\"${osMajorVersion}\".\"${osArchitecture}\".\"${osRuntime}\".\"${{ inputs.backend }}\".file" inventory.json)"
         downloadFile="${downloadFile#*/}"
-        printf "::group::${ANSI_LIGHT_BLUE}%s${ANSI_NOCOLOR}\n" "Downloading asset from '${downloadBase}/${downloadFile}' and extracting file ..."
+        printf "::group::${ANSI_LIGHT_BLUE}%s${ANSI_NOCOLOR}\n" "Downloading asset from '${downloadBase}/${downloadFile}' ..."
         curl -L "${downloadBase}/${downloadFile}" -o "${downloadFile}"
         retCode=$?
         printf "::endgroup::\n"
@@ -252,8 +261,15 @@ runs:
 
         if [[ "${osRuntime}" == "native" ]]; then
           printf "%s" "Extracting installation archive ... "
-          tar -xzf "${downloadFile}" --strip-components 1
-          if [[ $? -eq 0 ]]; then
+          if [[ "${osName}" == "Windows" ]]; then
+            ls .
+            unzip "${downloadFile}" .
+            retCode=$?
+          else  # macOS, Ubuntu
+            tar -xzf "${downloadFile}" --strip-components 1
+            retCode=$?
+          fi
+          if [[ $retCode -eq 0 ]]; then
             printf "${ANSI_LIGHT_GREEN}%s${ANSI_NOCOLOR}\n" "[OK]"
           else
             printf "${ANSI_LIGHT_RED}%s${ANSI_NOCOLOR}\n" "[FAILED]"
@@ -315,59 +331,3 @@ runs:
         printf "%s\n" "$(pwd)/bin" >> ${GITHUB_PATH}
 
         printf "Writing step outputs ...\n"
-
-    - name: Download and install GHDL on Windows (native)
-      id: Windows
-      if: runner.os == 'Windows' && runner.arch == 'X64' && inputs.runtime == ''
-      shell: powershell
-      run: |
-        # Download and install GHDL on Windows (native)
-        $BACKEND = "mcode"
-        $RUNTIME = "ucrt64"
-
-        if ( "${{ inputs.version }}" -eq "nightly" ) {
-          $VERSION_IN_URL =  "nightly"
-          $VERSION_IN_FILE = "${{ steps.variables.outputs.nightly-version }}"
-
-          echo "Version: nightly (${VERSION_IN_FILE})"
-        } elseif ( "${{ inputs.version }}" -eq "latest" ) {
-          $VERSION_IN_URL =  "${{ steps.variables.outputs.nightly-version }}"
-          $VERSION_IN_FILE = "${{ steps.variables.outputs.nightly-version }}"
-
-          echo "Version: nightly (${VERSION_IN_FILE})"
-        } elseif ( "${{ inputs.version }}" -match '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$' ) {
-          $VERSION_IN_URL =  "${{ inputs.version }}"
-          $VERSION_IN_FILE = "${{ inputs.version }}"
-
-          echo "Version: ${{ inputs.version }}"
-        } else {
-          echo "::error title=setup-ghdl::Unsupported GHDL version '${{ inputs.version }}'."
-          exit 1
-        }
-
-        if ( "${{ inputs.backend }}" -eq "mcode" ) {
-          echo "Backend: ${{ inputs.backend }}"
-        } else {
-          echo "::error title=setup-ghdl::Unsupported GHDL backend '${{ inputs.backend }}'."
-          exit 1
-        }
-
-        echo "Creating installation directory '${{ inputs.install-directory }}' ..."
-        mkdir "${{ inputs.install-directory }}" | Out-Null
-        cd "${{ inputs.install-directory }}"
-
-        $DOWNLOAD_URL = "https://github.com/ghdl/ghdl/releases/download/${VERSION_IN_URL}/ghdl-${BACKEND}-${VERSION_IN_FILE}-${RUNTIME}.zip"
-        echo "Downloading asset from '${DOWNLOAD_URL}' ..."
-        curl "${DOWNLOAD_URL}" -o ghdl.zip
-
-        echo "Extracting zip file 'ghdl.zip' ..."
-        Expand-Archive -Path "ghdl.zip" -DestinationPath "."
-
-        echo "Removing zip file 'ghdl.zip' ..."
-        rm "ghdl.zip"
-
-        echo "Setting environment variable 'GHDL_PREFIX' ..."
-        echo "GHDL_PREFIX=$($(pwd).Path)\lib\ghdl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-        echo "Adding GHDL to 'PATH' ..."
-        echo "$($(pwd).Path)\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append