Use sh in action (#15 )

Use sh in each action stanza
Add dependabot for github-actions
2026-02-12 11:06:55 +08:00 · 2024-11-15 05:46:41 -06:00 · 2024-11-14 19:47:37 -06:00 · 2024-11-14 19:41:13 -06:00 · 2024-11-14 19:38:37 -06:00 · 2024-11-14 19:19:41 -06:00
8 changed files with 202 additions and 21 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
--- a/.github/workflows/example-linux.yaml
+++ b/.github/workflows/example-linux.yaml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: 'Setup jq'
-        uses: dcarbone/install-jq-action@v2.0.0
+        uses: dcarbone/install-jq-action@v3
        with:
          version: '${{ inputs.version }}'
          force: '${{ inputs.force }}'
--- a/.github/workflows/example-macos.yaml
+++ b/.github/workflows/example-macos.yaml
@@ -19,7 +19,7 @@ jobs:
    runs-on: macos-latest
    steps:
      - name: 'Setup jq'
-        uses: dcarbone/install-jq-action@v2.0.0
+        uses: dcarbone/install-jq-action@v3
        with:
          version: '${{ inputs.version }}'
          force: '${{ inputs.force }}'
--- a/.github/workflows/example-windows.yaml
+++ b/.github/workflows/example-windows.yaml
@@ -19,7 +19,7 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: 'Setup jq'
-        uses: dcarbone/install-jq-action@v2.0.0
+        uses: dcarbone/install-jq-action@v3
        with:
          version: '${{ inputs.version }}'
          force: '${{ inputs.force }}'
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,20 +23,114 @@ jobs:
    strategy:
      matrix:
        image:
-          - "ubuntu-22.04"
+          - "ubuntu-latest"
          - "ubuntu-20.04"
+          - "ubuntu-22.04"
+          - "ubuntu-24.04"
+          - "macos-latest"
          - "macos-13"
-          - "macos-11"
-          - "macos-12"
-          - "windows-2022"
+          - "macos-14"
+          - "macos-15"
+          - "windows-latest"
          - "windows-2019"
+          - "windows-2022"
        force:
          - 'true'
          - 'false'
        version:
-          - '1.5'
-          - '1.6'
          - '1.7'
+        include:
+          - image: "ubuntu-latest"
+            version: '1.6'
+            force: true
+          - image: "ubuntu-latest"
+            version: '1.6'
+            force: false
+          - image: "ubuntu-latest"
+            version: '1.5'
+            force: true
+          - image: "ubuntu-latest"
+            version: '1.5'
+            force: false
+
+          - image: "ubuntu-20.04"
+            version: '1.6'
+            force: true
+          - image: "ubuntu-20.04"
+            version: '1.6'
+            force: false
+          - image: "ubuntu-20.04"
+            version: '1.5'
+            force: true
+          - image: "ubuntu-20.04"
+            version: '1.5'
+            force: false
+
+          - image: "ubuntu-22.04"
+            version: '1.6'
+            force: true
+          - image: "ubuntu-22.04"
+            version: '1.6'
+            force: false
+          - image: "ubuntu-22.04"
+            version: '1.5'
+            force: true
+          - image: "ubuntu-22.04"
+            version: '1.5'
+            force: false
+
+          - image: "ubuntu-24.04"
+            version: '1.6'
+            force: true
+          - image: "ubuntu-24.04"
+            version: '1.6'
+            force: false
+          - image: "ubuntu-24.04"
+            version: '1.5'
+            force: true
+          - image: "ubuntu-24.04"
+            version: '1.5'
+            force: false
+
+          - image: "windows-latest"
+            version: '1.6'
+            force: true
+          - image: "windows-latest"
+            version: '1.6'
+            force: false
+          - image: "windows-latest"
+            version: '1.5'
+            force: true
+          - image: "windows-latest"
+            version: '1.5'
+            force: false
+
+          - image: "windows-2019"
+            version: '1.6'
+            force: true
+          - image: "windows-2019"
+            version: '1.6'
+            force: false
+          - image: "windows-2019"
+            version: '1.5'
+            force: true
+          - image: "windows-2019"
+            version: '1.5'
+            force: false
+
+          - image: "windows-2022"
+            version: '1.6'
+            force: true
+          - image: "windows-2022"
+            version: '1.6'
+            force: false
+          - image: "windows-2022"
+            version: '1.5'
+            force: true
+          - image: "windows-2022"
+            version: '1.5'
+            force: false
+
    name: "Test Action - (img: ${{ matrix.image }}; version: ${{ matrix.version }}; force: ${{ matrix.force }})"
    runs-on: ${{ matrix.image }}
    steps:
@@ -44,7 +138,7 @@ jobs:

      - name: Setup jq
        id: install-jq
-        uses: dcarbone/install-jq-action@main
+        uses: ./
        with:
          version: '${{ matrix.version }}'
          force: '${{ matrix.force }}'
@@ -169,3 +263,84 @@ jobs:
          {
              exit 1
          }
+  test-container:
+    strategy:
+      matrix:
+        image:
+          - "ubuntu-24.04"
+          - "ubuntu-22.04"
+          - "ubuntu-20.04"
+        force:
+          - 'true'
+          - 'false'
+        version:
+          - '1.5'
+          - '1.6'
+          - '1.7'
+    name: "Test Action (Container) - (img: ${{ matrix.image }}; version: ${{ matrix.version }}; force: ${{ matrix.force }})"
+    runs-on: ${{ matrix.image }}
+    container:
+      image: node:20
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup jq
+        id: install-jq
+        uses: ./
+        with:
+          version: '${{ matrix.version }}'
+          force: '${{ matrix.force }}'
+
+      - name: Check jq
+        # language=sh
+        run: |
+          _err=
+          _which="$(which jq)"
+          _vers="$(jq --version)"
+          if [[ "${_which}" != "$RUNNER_TOOL_CACHE/jq/jq" ]]; then
+            echo "jq found at unexpected path."
+            echo "  Expected:   \"$RUNNER_TOOL_CACHE/jq/jq\""
+            echo "  Actual:     \"${_which}\""
+            _err=1
+          fi
+          if [[ "${_vers}" != 'jq-${{ matrix.version }}' ]]; then
+            echo "jq --version returned unexpected value"
+            echo '  Expected:   "jq-${{ matrix.version }}"'
+            echo "  Actual:     \"${_vers}\""
+            _err=1
+          fi
+          if [ -n "${_err}" ]; then exit 1; fi;
+
+      - name: Check Outputs
+        # language=sh
+        run: |
+          _installed='${{ steps.install-jq.outputs.installed }}'
+          _err=
+          if [[ '${{ matrix.force }}' == 'true' ]]; then
+            # enabling "force" must result in an install
+            if [[ '${{ steps.install-jq.outputs.installed }}' != 'true' ]]; then
+              echo 'Unexpected value for "installed":'
+              echo 'Expected:   "true"'
+              echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
+              _err=1
+            fi
+          else
+            if [[ '${{ steps.install-jq.outputs.found }}' == 'true' ]]; then
+              # if found, must not be installed without force
+              if [[ '${{ steps.install-jq.outputs.installed }}' != 'false' ]]; then
+                echo 'Unexpected value for "installed":'
+                echo 'Expected:   "false"'
+                echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
+                _err=1
+              fi
+            else
+              # if not found, must be installed
+              if [[ '${{ steps.install-jq.outputs.installed }}' != 'true' ]]; then
+                echo 'Unexpected value for "installed":'
+                echo 'Expected:   "true"'
+                echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
+                _err=1
+              fi
+            fi
+          fi
+          if [ -n "${_err}" ]; then exit 1; fi;
--- a/action.yaml
+++ b/action.yaml
@@ -30,7 +30,7 @@ runs:
    - name: 'Check for jq - Unix-ish'
      id: jq-check-unix
      if: (runner.os == 'Linux' || runner.os == 'macOS')
-      shell: bash +e {0}
+      shell: sh +e {0}
      # language=sh
      run: |
        _jq_bin="$(which jq)"
@@ -42,19 +42,19 @@ runs:

    - name: 'Install jq - Unix-ish non-1.7'
      if: (runner.os == 'Linux' || runner.os == 'macOS') && (inputs.version == '1.5' || inputs.version == '1.6') && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true')
-      shell: bash
+      shell: sh
      env:
        JQ_VERSION: '${{ inputs.version }}'
      # language=sh
-      run: ${{ github.action_path }}/scripts/unixish.sh
+      run: ${GITHUB_ACTION_PATH}/scripts/unixish.sh

    - name: 'Install jq - Unix-ish 1.7'
      if: (runner.os == 'Linux' || runner.os == 'macOS') && inputs.version == '1.7' && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true')
-      shell: bash
+      shell: sh
      env:
        JQ_VERSION: '${{ inputs.version }}'
      # language=sh
-      run: ${{ github.action_path }}/scripts/unixish-17.sh
+      run: ${GITHUB_ACTION_PATH}/scripts/unixish-17.sh

    - name: 'Check for jq - Windows-ish'
      id: jq-check-windows
--- a/scripts/unixish-17.sh
+++ b/scripts/unixish-17.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh

 set -e

@@ -23,7 +23,7 @@ case $RUNNER_OS in
    _os='linux'
    ;;
  macOS)
-    _os='osx'
+    _os='macos'
    ;;

  *)
@@ -73,7 +73,7 @@ echo '::group::Downloading jq'
 echo "Src: ${_dl_url}"
 echo "Dst: ${_dl_path}"

-wget -O- "${_dl_url}" > "${_dl_path}"
+curl -L "${_dl_url}" -o "${_dl_path}"

 echo '::endgroup::'

--- a/scripts/unixish.sh
+++ b/scripts/unixish.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh

 set -e

@@ -54,7 +54,7 @@ esac

 # determine binary name

-if [[ "${_os}" == "linux" ]]; then
+if [ "${_os}" = "linux" ]; then
  case "${_arch}" in
    '386')
      _bin_name="jq-linux32"
@@ -93,7 +93,7 @@ echo '::group::Downloading jq'
 echo "Src: ${_dl_url}"
 echo "Dst: ${_dl_path}"

-wget -O- "${_dl_url}" > "${_dl_path}"
+curl -L "${_dl_url}" -o "${_dl_path}"

 echo '::endgroup::'
Author	SHA1	Message	Date
Daniel Carbone	e397bd8743	Use sh in action (#15 ) Use sh in each action stanza	2024-11-15 05:46:41 -06:00
Daniel Carbone	36b228ee68	Add dependabot for github-actions	2024-11-14 19:47:37 -06:00
Daniel Carbone	d5935278d5	updating examples	2024-11-14 19:41:13 -06:00
Daniel Carbone	ca8101273e	trying out posix sh (#14 ) * trying out posix sh	2024-11-14 19:38:37 -06:00
Daniel Carbone	de7c0d1fb1	updating matrix versions (#12 ) * updating matrix versions	2024-11-14 19:19:41 -06:00
Daniel Carbone	8867ddb478	remove windows gubbins from container tests	2023-11-07 14:50:52 -06:00
Michael Busby	945d84920f	Support running action inside containers (#10 ) * Add container tests * Update github actions path to fix container compat	2023-11-07 14:47:46 -06:00
akhil	1090b8bd11	use curl instead of wget to fix failure on macOS runners (#8 )	2023-09-29 12:04:15 -05:00
Daniel Carbone	ff922c75b7	Update example-windows.yaml	2023-09-27 19:11:45 -05:00
Daniel Carbone	7f4d6f4833	Update example-macos.yaml	2023-09-27 19:11:32 -05:00
Daniel Carbone	bfb9fa8e7d	Update example-linux.yaml	2023-09-27 19:11:18 -05:00
Daniel Carbone	c1548c666d	using macos as dl link os prefix in lieu of osx (#7 ) * using macos as dl link os prefix in lieu of osx * probably won't work	2023-09-27 18:12:19 -05:00