From 7d68940126841f8d0d59d375a88eec410e248be2 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Wed, 6 Mar 2024 20:06:20 -0500 Subject: [PATCH 1/4] test version string entry --- .github/workflows/example-builds.yml | 2 +- lib/setup-julia.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/example-builds.yml b/.github/workflows/example-builds.yml index 0515b128..15635ccf 100644 --- a/.github/workflows/example-builds.yml +++ b/.github/workflows/example-builds.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - julia-version: ['1.0.5', '1.2', '^1.5.0-beta1', '1'] + julia-version: [1.10, '1.10'] julia-arch: [x64, x86] os: [ubuntu-latest, macOS-latest, windows-latest] # 32-bit Julia binaries are not available on macOS diff --git a/lib/setup-julia.js b/lib/setup-julia.js index 2b967b3b..321249b0 100644 --- a/lib/setup-julia.js +++ b/lib/setup-julia.js @@ -67,6 +67,7 @@ function run() { } // Inputs const versionInput = core.getInput('version'); + core.debug(`raw version: ${versionInput} type: ${typeof versionInput}`); const includePrereleases = core.getInput('include-all-prereleases') == 'true'; const originalArchInput = core.getInput('arch'); // It can easily happen that, for example, a workflow file contains an input `version: ${{ matrix.julia-version }}` From abaa3bb38d7f6602a252f69ecb4dd03392904500 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Wed, 6 Mar 2024 20:06:28 -0500 Subject: [PATCH 2/4] disable unrelated CI --- .../workflows/example-builds-defaultarch.yml | 48 ----------------- .../example-builds-nightly-defaultarch.yml | 53 ------------------ .github/workflows/example-builds-nightly.yml | 54 ------------------- 3 files changed, 155 deletions(-) delete mode 100644 .github/workflows/example-builds-defaultarch.yml delete mode 100644 .github/workflows/example-builds-nightly-defaultarch.yml delete mode 100644 .github/workflows/example-builds-nightly.yml diff --git a/.github/workflows/example-builds-defaultarch.yml b/.github/workflows/example-builds-defaultarch.yml deleted file mode 100644 index 23740c85..00000000 --- a/.github/workflows/example-builds-defaultarch.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Example builds (default arch) - -concurrency: - # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches - # Cancel intermediate builds: only pull request builds - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }} - cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} - -on: - push: - branches: ['main', 'master', 'releases/*'] - pull_request: - workflow_dispatch: - -jobs: - test: - runs-on: ${{ matrix.os }} - timeout-minutes: 60 - strategy: - fail-fast: false - matrix: - julia-version: ['1'] - os: [ubuntu-latest, macOS-latest, windows-latest] - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - if: ${{ ! startsWith(github.ref, 'refs/heads/releases') }} - with: - node-version: 16 - - - name: "Install dependencies" - if: ${{ ! startsWith(github.ref, 'refs/heads/releases') }} - run: | - npm install - npm run build - npm run pack - - - name: "Set up Julia" - id: setup-julia - uses: ./ - with: - version: ${{ matrix.julia-version }} - - run: julia --version - - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()' - - name: "Check that the correct julia is used and that archive mtimes are maintained" - run: julia --startup-file=no --color=yes ./.github/scripts/common-tests.jl diff --git a/.github/workflows/example-builds-nightly-defaultarch.yml b/.github/workflows/example-builds-nightly-defaultarch.yml deleted file mode 100644 index 40b9a88c..00000000 --- a/.github/workflows/example-builds-nightly-defaultarch.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Example builds (nightly, default arch) - -concurrency: - # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches - # Cancel intermediate builds: only pull request builds - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }} - cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} - -on: - push: - branches: ['main', 'master', 'releases/*'] - pull_request: - -jobs: - test: - runs-on: ${{ matrix.os }} - timeout-minutes: 60 - strategy: - fail-fast: false - matrix: - julia-version: [nightly, 1.10-nightly] - os: - - ubuntu-latest - - windows-latest - - macos-11 # Intel - - macos-12 # Intel - - macos-13 # Intel - - macos-14 # Apple Silicon - - macos-latest # Currently Intel, but will probably point to Apple Silicon in the future - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - if: ${{ ! startsWith(github.ref, 'refs/heads/releases') }} - with: - node-version: 16 - - - name: "Install dependencies" - if: ${{ ! startsWith(github.ref, 'refs/heads/releases') }} - run: | - npm install - npm run build - npm run pack - - - name: "Set up Julia (${{ matrix.julia-version }})" - uses: ./ - with: - version: ${{ matrix.julia-version }} - - run: julia --version - - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()' - - name: "Check that the correct julia is used and that archive mtimes are maintained" - run: julia --startup-file=no --color=yes ./.github/scripts/common-tests.jl diff --git a/.github/workflows/example-builds-nightly.yml b/.github/workflows/example-builds-nightly.yml deleted file mode 100644 index 21190a65..00000000 --- a/.github/workflows/example-builds-nightly.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Example builds (nightly) - -concurrency: - # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches - # Cancel intermediate builds: only pull request builds - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }} - cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} - -on: - push: - branches: ['main', 'master', 'releases/*'] - pull_request: - schedule: - - cron: '37 17 * * *' - -jobs: - test: - runs-on: ${{ matrix.os }} - timeout-minutes: 60 - strategy: - fail-fast: false - matrix: - julia-version: [nightly, 1.10-nightly] - julia-arch: [x64, x86] - os: [ubuntu-latest, macOS-latest, windows-latest] - # 32-bit Julia binaries are not available on macOS - exclude: - - os: macOS-latest - julia-arch: x86 - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - if: ${{ ! startsWith(github.ref, 'refs/heads/releases') }} - with: - node-version: 16 - - - name: "Install dependencies" - if: ${{ ! startsWith(github.ref, 'refs/heads/releases') }} - run: | - npm install - npm run build - npm run pack - - - name: "Set up Julia (${{ matrix.julia-version }})" - uses: ./ - with: - version: ${{ matrix.julia-version }} - arch: ${{ matrix.julia-arch }} - - run: julia --version - - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()' - - name: "Check that the correct julia is used and that archive mtimes are maintained" - run: julia --startup-file=no --color=yes ./.github/scripts/common-tests.jl From 6734d7ba431a9661a09f6e66df3802712bce8b94 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Wed, 6 Mar 2024 20:11:25 -0500 Subject: [PATCH 3/4] Update setup-julia.ts --- src/setup-julia.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup-julia.ts b/src/setup-julia.ts index 1f309232..5e9774e7 100644 --- a/src/setup-julia.ts +++ b/src/setup-julia.ts @@ -40,6 +40,7 @@ async function run() { // Inputs const versionInput = core.getInput('version') + core.debug(`raw version: ${versionInput} type: ${typeof versionInput}`) const includePrereleases = core.getInput('include-all-prereleases') == 'true' const originalArchInput = core.getInput('arch') From d63e878df958a5b845b5c08cb369c10f11691a6f Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Wed, 6 Mar 2024 20:17:17 -0500 Subject: [PATCH 4/4] inspect env --- lib/setup-julia.js | 3 ++- src/setup-julia.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/setup-julia.js b/lib/setup-julia.js index 321249b0..d028e451 100644 --- a/lib/setup-julia.js +++ b/lib/setup-julia.js @@ -67,7 +67,8 @@ function run() { } // Inputs const versionInput = core.getInput('version'); - core.debug(`raw version: ${versionInput} type: ${typeof versionInput}`); + core.debug(`getInput version: ${versionInput} type: ${typeof versionInput}`); + core.debug(`env version: ${process.env[`INPUT_VERSION`]} type: ${typeof process.env[`INPUT_VERSION`]}`); const includePrereleases = core.getInput('include-all-prereleases') == 'true'; const originalArchInput = core.getInput('arch'); // It can easily happen that, for example, a workflow file contains an input `version: ${{ matrix.julia-version }}` diff --git a/src/setup-julia.ts b/src/setup-julia.ts index 5e9774e7..22e3d100 100644 --- a/src/setup-julia.ts +++ b/src/setup-julia.ts @@ -40,7 +40,8 @@ async function run() { // Inputs const versionInput = core.getInput('version') - core.debug(`raw version: ${versionInput} type: ${typeof versionInput}`) + core.debug(`getInput version: ${versionInput} type: ${typeof versionInput}`) + core.debug(`env version: ${process.env[`INPUT_VERSION`]} type: ${typeof process.env[`INPUT_VERSION`]}`) const includePrereleases = core.getInput('include-all-prereleases') == 'true' const originalArchInput = core.getInput('arch')