From 42d62a8d9855d9c8d13dbaa423b19f22371684fb Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 11:39:42 +0200 Subject: [PATCH 1/7] Add .editorconfig --- .editorconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..73e8f0d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +# https://editorconfig.org +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true From 40b59eb0f9338a315192073cd07351d88d761df1 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 10:31:46 +0200 Subject: [PATCH 2/7] Update, extend, and run pre-commit hooks --- .github/workflows/ci.yml | 4 +- .github/workflows/lint.yml | 16 ++-- .github/workflows/update-versions.yml | 4 +- .pre-commit-config.yaml | 31 +++++- .yamllint.yml | 2 + .zenodo.json | 7 +- jill.sh | 130 +++++++++++++------------- 7 files changed, 106 insertions(+), 88 deletions(-) create mode 100644 .yamllint.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39a2082..56905b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] workflow_dispatch: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 07a624a..3b9e110 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,13 +13,13 @@ jobs: name: Linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: 3.x + - uses: actions/setup-python@v4 + with: + python-version: 3.x - - name: Install and run pre-commit - run: | - pip install pre-commit - pre-commit run -a + - name: Install and run pre-commit + run: | + pip install pre-commit + pre-commit run -a diff --git a/.github/workflows/update-versions.yml b/.github/workflows/update-versions.yml index 55f4cd7..a3ca769 100644 --- a/.github/workflows/update-versions.yml +++ b/.github/workflows/update-versions.yml @@ -23,7 +23,7 @@ jobs: - name: Install Julia, but only if it is not already available in the PATH uses: julia-actions/setup-julia@v1 with: - version: '1' + version: "1" arch: ${{ runner.arch }} if: steps.julia_in_path.outcome != 'success' @@ -38,7 +38,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: ":robot: Auto-update Julia versions" - title: '[AUTO] Update Julia versions' + title: "[AUTO] Update Julia versions" branch: auto-update-versions delete-branch: true labels: update, automated pr, no changelog diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9dea6fe..435dc21 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,21 +1,44 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace + - id: mixed-line-ending + args: [--fix=lf] + - id: no-commit-to-branch + - id: check-merge-conflict + args: [--assume-in-merge] + - repo: https://github.com/scop/pre-commit-shfmt + rev: v3.9.0-1 + hooks: + - id: shfmt - repo: https://github.com/koalaman/shellcheck-precommit - rev: v0.9.0 + rev: v0.10.0 hooks: - id: shellcheck - repo: https://github.com/markdownlint/markdownlint rev: v0.12.0 hooks: - id: markdownlint - args: [ -r, "~MD013,~MD029,~MD024,~MD033" ] + args: [-r, "~MD013,~MD029,~MD024,~MD033"] exclude: "^.git" + - repo: https://github.com/citation-file-format/cffconvert + rev: 054bda51dbe278b3e86f27c890e3f3ac877d616c + hooks: + - id: validate-cff + - repo: https://github.com/pre-commit/mirrors-prettier + rev: "v4.0.0-alpha.8" # Use the sha or tag you want to point at + hooks: + - id: prettier + types_or: [yaml, json] + exclude: ".copier-answers.yml" + - repo: https://github.com/adrienverge/yamllint + rev: v1.35.1 + hooks: + - id: yamllint - repo: https://github.com/tcort/markdown-link-check - rev: v3.10.3 + rev: v3.12.2 hooks: - id: markdown-link-check diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000..5e16e5f --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,2 @@ +rules: + indentation: { spaces: 2 } diff --git a/.zenodo.json b/.zenodo.json index 6bd9c21..b3ab527 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -7,12 +7,7 @@ } ], "description": "Jill is a Julia installer script in Bash.", - "keywords": [ - "julia", - "julialang", - "installer", - "bash" - ], + "keywords": ["julia", "julialang", "installer", "bash"], "license": { "id": "GPL-3.0" }, diff --git a/jill.sh b/jill.sh index 617794c..d3cc531 100755 --- a/jill.sh +++ b/jill.sh @@ -46,54 +46,52 @@ SKIP_CONFIRM=0 UPGRADE_CONFIRM=0 JULIA_OLD="" -while [[ $# -gt 0 ]] -do -key="$1" +while [[ $# -gt 0 ]]; do + key="$1" -case $key in - -h|--help) - usage - shift - exit 0 - ;; - --lts) - JULIA_VERSION="$JULIA_LTS" - shift - ;; - --rc) - if ! command -v jq --version &> /dev/null - then - echo "Option --rc requires jq to be installed. Alternatively, use -v with x.y.z-rcN. Aborting" - exit 1 - fi - JULIA_VERSION="$(curl -L https://julialang-s3.julialang.org/bin/versions.json | jq -r '[keys[] | select(contains("rc"))] | .[-1]')" - if [ -z "$JULIA_VERSION" ]; then - echo "Option --rc failed." - exit 1 - fi - shift - ;; - -u|--upgrade) - UPGRADE_CONFIRM=1 - JULIA_OLD="$2" - shift - shift - ;; - -v|--version) - JULIA_VERSION="$2" - shift - shift - ;; - -y|--yes|--no-confirm) - SKIP_CONFIRM=1 - shift - ;; - *) # unknown option - echo "Invalid option: $1" >&2 - usage - exit 1; - ;; -esac + case $key in + -h | --help) + usage + shift + exit 0 + ;; + --lts) + JULIA_VERSION="$JULIA_LTS" + shift + ;; + --rc) + if ! command -v jq --version &>/dev/null; then + echo "Option --rc requires jq to be installed. Alternatively, use -v with x.y.z-rcN. Aborting" + exit 1 + fi + JULIA_VERSION="$(curl -L https://julialang-s3.julialang.org/bin/versions.json | jq -r '[keys[] | select(contains("rc"))] | .[-1]')" + if [ -z "$JULIA_VERSION" ]; then + echo "Option --rc failed." + exit 1 + fi + shift + ;; + -u | --upgrade) + UPGRADE_CONFIRM=1 + JULIA_OLD="$2" + shift + shift + ;; + -v | --version) + JULIA_VERSION="$2" + shift + shift + ;; + -y | --yes | --no-confirm) + SKIP_CONFIRM=1 + shift + ;; + *) # unknown option + echo "Invalid option: $1" >&2 + usage + exit 1 + ;; + esac done # For Linux, this script installs Julia into $JULIA_DOWNLOAD and make a @@ -120,7 +118,7 @@ function badfolder() { echo "The folder ${JULIA_INSTALL@Q} is not on your PATH, you can" echo "- 1) Add it to your path; or" echo "- 2) Run 'JULIA_INSTALL=otherfolder ./jill.sh'" - if [[ "$SKIP_CONFIRM" == "0" ]]; then + if [[ $SKIP_CONFIRM == "0" ]]; then read -p "Do you want to add ${JULIA_INSTALL@Q} into your PATH? (Aborting otherwise) (Y/N) " -n 1 -r echo if [[ ! $REPLY =~ ^[Yy] ]]; then @@ -136,7 +134,7 @@ function badfolder() { function hi() { header - if [[ ! ":$PATH:" == *":$JULIA_INSTALL:"* ]]; then + if [[ ":$PATH:" != *":$JULIA_INSTALL:"* ]]; then badfolder fi mkdir -p "$JULIA_INSTALL" # won't create if it's aborted earlier @@ -214,7 +212,7 @@ function install_julia_linux() { mkdir -p "julia-$version" tar zxf "julia-$version.tar.gz" -C "julia-$version" --strip-components 1 fi - if [[ "$LATEST" == "1" ]]; then + if [[ $LATEST == "1" ]]; then # Need to change suffix x.y-latest to x.y.z JLVERSION=$(./julia-"$version"/bin/julia -version | cut -d' ' -f3) if [ -d "julia-$JLVERSION" ]; then @@ -231,7 +229,7 @@ function install_julia_linux() { rm -f "$JULIA_INSTALL"/julia{,-"$minor",-"$version"} julia="$PWD/julia-$version/bin/julia" - if [[ "$UPGRADE_CONFIRM" == "1" ]]; then + if [[ $UPGRADE_CONFIRM == "1" ]]; then old_minor=$(echo "$JULIA_OLD" | cut -d. -f1,2 | cut -d- -f1) if [ "$USER" == "root" ] && [ -n "$SUDO_USER" ]; then JULIAENV="/home/$SUDO_USER" @@ -271,9 +269,9 @@ function install_julia_mac() { hdiutil attach "julia-$version.dmg" -quiet -mount required -mountpoint "julia-$minor" if [ ! -d "julia-$minor" ]; then - # if it fails to mount for unknown reason, try it again after 1 second... - sleep 1 - hdiutil attach "julia-$version.dmg" -quiet -mount required -mountpoint "julia-$minor" + # if it fails to mount for unknown reason, try it again after 1 second... + sleep 1 + hdiutil attach "julia-$version.dmg" -quiet -mount required -mountpoint "julia-$minor" fi INSTALL_PATH="/Applications/julia-$minor.app" @@ -281,7 +279,7 @@ function install_julia_mac() { rm -rf "$INSTALL_PATH" cp -a "julia-$minor/Julia-$minor.app" /Applications/ - if [[ "$UPGRADE_CONFIRM" == "1" ]]; then + if [[ $UPGRADE_CONFIRM == "1" ]]; then old_minor=$(echo "$JULIA_OLD" | cut -d. -f1,2 | cut -d- -f1) if [ "$USER" == "root" ] && [ -n "$SUDO_USER" ]; then JULIAENV="/Users/$SUDO_USER" @@ -297,7 +295,7 @@ function install_julia_mac() { ln -sf "$EXEC_PATH" "$JULIA_INSTALL/julia" ln -sf "$EXEC_PATH" "$JULIA_INSTALL/julia-$minor" - if [[ "$LATEST" == "1" ]]; then + if [[ $LATEST == "1" ]]; then version="$("$JULIA_INSTALL"/julia -version | cut -d' ' -f3)" fi ln -sf "$EXEC_PATH" "$JULIA_INSTALL/julia-$version" @@ -310,17 +308,17 @@ function install_julia_mac() { # Main hi -if [[ "$SKIP_CONFIRM" == "0" ]]; then - confirm +if [[ $SKIP_CONFIRM == "0" ]]; then + confirm fi unameOut="$(uname -s)" case "${unameOut}" in - Linux*) install_julia_linux ;; - Darwin*) install_julia_mac ;; - # CYGWIN*) machine=Cygwin;; - # MINGW*) machine=MinGw;; - *) - echo "Unsupported platform $(unameOut)" >&2 - exit 1 - ;; +Linux*) install_julia_linux ;; +Darwin*) install_julia_mac ;; +# CYGWIN*) machine=Cygwin;; +# MINGW*) machine=MinGw;; +*) + echo "Unsupported platform $(unameOut)" >&2 + exit 1 + ;; esac From 625a50988b5737bc98636fbe7f5190a439e46fe7 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 10:32:29 +0200 Subject: [PATCH 3/7] Add .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules From af3982efa5d02aea5c66d43c430be812d1ebfe74 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 10:37:32 +0200 Subject: [PATCH 4/7] Add link-checker lychee and update lint workflow --- .github/workflows/ci.yml | 11 ++++-- .github/workflows/lint.yml | 52 ++++++++++++++++++++++----- .github/workflows/update-versions.yml | 8 +++-- .lychee.toml | 8 +++++ CHANGELOG.md | 1 - 5 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 .lychee.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56905b8..fe0b9aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: CI on: push: branches: [main] + tags: ["*"] pull_request: branches: [main] @@ -14,14 +15,18 @@ jobs: strategy: matrix: - jlversion: [0.5.2, 1.0.5, 1.3.0, 1.6.7, 1.8.1, 1.8.0-rc4] + jlversion: + [0.5.2, 1.0.5, 1.3.0, 1.6.7, 1.8.1, 1.8.0-rc4, 1.10.5, 1.11.0] os: [ubuntu-latest, macos-latest] sudo: ["", "sudo"] steps: - - uses: actions/checkout@v3 - - name: add symlink dir to PATH + - name: Clone repo + uses: actions/checkout@v4 + + - name: Add symlink dir to PATH run: echo "$HOME/.local/bin" >> $GITHUB_PATH + - name: Test script env: VERSION: ${{ matrix.jlversion }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3b9e110..5abcec8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,25 +1,61 @@ name: Linting - on: push: branches: - main + tags: ["*"] pull_request: branches: - main +concurrency: + # Skip intermediate builds: always. + # Cancel intermediate builds: only if it is a pull request build. + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} + jobs: lint: name: Linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Clone repo + uses: actions/checkout@v4 + + - name: Hack for setup-python cache # https://github.com/actions/setup-python/issues/807 + run: touch requirements.txt + + - name: Setup Python + uses: actions/setup-python@v5 + with: + cache: "pip" + python-version: "3.11" + + - name: Un-Hack for setup-python cache # https://github.com/actions/setup-python/issues/807 + run: rm requirements.txt - - uses: actions/setup-python@v4 + - name: Cache pre-commit + uses: actions/cache@v4 with: - python-version: 3.x + path: ~/.cache/pre-commit + key: ${{ runner.os }}-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }} - - name: Install and run pre-commit - run: | - pip install pre-commit - pre-commit run -a + - name: Install pre-commit + run: pip install pre-commit + + - name: Run pre-commit + run: SKIP=no-commit-to-branch pre-commit run -a + + link-checker: + name: Link checker + runs-on: ubuntu-latest + steps: + - name: Clone repo + uses: actions/checkout@v4 + + - name: Link Checker + id: lychee + uses: lycheeverse/lychee-action@v1 + with: + fail: true + args: --config '.lychee.toml' . diff --git a/.github/workflows/update-versions.yml b/.github/workflows/update-versions.yml index a3ca769..1cc6206 100644 --- a/.github/workflows/update-versions.yml +++ b/.github/workflows/update-versions.yml @@ -13,7 +13,8 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Clone repo + uses: actions/checkout@v4 - name: Check if Julia is already available in the PATH id: julia_in_path @@ -21,12 +22,15 @@ jobs: continue-on-error: true - name: Install Julia, but only if it is not already available in the PATH - uses: julia-actions/setup-julia@v1 + uses: julia-actions/setup-julia@v2 with: version: "1" arch: ${{ runner.arch }} if: steps.julia_in_path.outcome != 'success' + - name: Use Julia cache + uses: julia-actions/cache@v2 + - name: Install JSON3 and run script run: | julia -e 'import Pkg; Pkg.add("JSON3")' diff --git a/.lychee.toml b/.lychee.toml new file mode 100644 index 0000000..1da0d8a --- /dev/null +++ b/.lychee.toml @@ -0,0 +1,8 @@ +exclude = [ + "@ref", + "^https://github.com/.*/releases/tag/v.*$", + "^https://github.com/.*/compare/v.*HEAD$" +] + +exclude_path = [ +] diff --git a/CHANGELOG.md b/CHANGELOG.md index 60fbf2b..8c5cdc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,7 +99,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 We didn't follow semantic versioning before, so this first tag has 4 years of work attached to it. - [unreleased]: https://github.com/abelsiqueira/jill/compare/v0.5.3...HEAD [0.5.3]: https://github.com/abelsiqueira/jill/compare/v0.5.2...v0.5.3 [0.5.2]: https://github.com/abelsiqueira/jill/compare/v0.5.1...v0.5.2 From fec904f13ba2639149b1c2f792512dd20a24a60e Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 10:47:44 +0200 Subject: [PATCH 5/7] Add dependabot --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2265783 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + inverval: "weekly" From 4c09d8505b6084852e94bbe72eb7577a1727cea8 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 10:58:47 +0200 Subject: [PATCH 6/7] Update LTS to 1.10.5 --- README.md | 4 ++-- ci-test.sh | 7 +++++-- jill.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2905566..ae0f266 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ![GitHub release (latest by date)](https://img.shields.io/github/v/release/abelsiqueira/jill?color=purple&logo=github&style=flat-square) ![Julia 1.11.0](https://img.shields.io/badge/Latest_stable-1.11.0-3a5fcc.svg?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAB+FBMVEUAAAA3lyU3liQ4mCY4mCY3lyU4lyY1liM3mCUskhlSpkIvkx0zlSEeigo5mSc8mio0liKPxYQ/nC5NozxQpUBHoDY3lyQ5mCc3lyY6mSg3lyVPpD9frVBgrVFZqUpEnjNgrVE3lyU8mio8mipWqEZhrVJgrVFfrE9JoTkAVAA3lyXJOjPMPjNZhCowmiNOoz1erE9grVFYqUhCnjFmk2KFYpqUV7KTWLDKOjK8CADORj7GJx3SJyVAmCtKojpOoz1DnzFVeVWVSLj///+UV7GVWbK8GBjPTEPMQTjPTUXQUkrQSEGZUycXmg+WXbKfZ7qgarqbYraSVLCUV7HLPDTKNy7QUEjUYVrVY1zTXFXPRz2UVLmha7upeMCqecGlcb6aYLWfaLrLPjXLPjXSWFDVZF3VY1zVYlvRTkSaWKqlcr6qesGqecGpd8CdZbjo2+7LPTTKOS/QUUnVYlvVY1zUXVbPSD6TV7OibLuqecGqecGmc76aYbaibLvKOC/SWlPMQjrQUEjRVEzPS0PLPDL7WROZX7WgarqibLucY7eTVrCVWLLLOzLGLCLQT0bIMynKOC7FJx3MPjV/Vc+odsCRUa+SVLCDPaWVWLKWWrLJOzPHOTLKPDPLPDPLOzLLPDOUV6+UV7CVWLKVWLKUV7GUWLGPUqv///8iGqajAAAAp3RSTlMAAAAAAAAAAAAAABAZBAAAAABOx9uVFQAAAB/Y////eQAAADv0////pgEAAAAAGtD///9uAAAAAAAAAAcOQbPLfxgNAAAAAAA5sMyGGg1Ht8p6CwAAFMf///94H9j///xiAAAw7////65K+f///5gAABjQ////gibg////bAAAAEfD3JwaAFfK2o0RAAAAAA4aBQAAABEZAwAAAAAAAAAAAAAAAAAAAIvMfRYAAAA6SURBVAjXtcexEUBAFAXAfTM/IDH6uAbUqkItyAQYR26zDeS0UxieBvPVbArjXd9GS295raa/Gmu/A7zfBRgv03cCAAAAAElFTkSuQmCC) -![Julia 1.6.7](https://img.shields.io/badge/jill.sh_----lts-1.6.7-3a5fcc.svg?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAB+FBMVEUAAAA3lyU3liQ4mCY4mCY3lyU4lyY1liM3mCUskhlSpkIvkx0zlSEeigo5mSc8mio0liKPxYQ/nC5NozxQpUBHoDY3lyQ5mCc3lyY6mSg3lyVPpD9frVBgrVFZqUpEnjNgrVE3lyU8mio8mipWqEZhrVJgrVFfrE9JoTkAVAA3lyXJOjPMPjNZhCowmiNOoz1erE9grVFYqUhCnjFmk2KFYpqUV7KTWLDKOjK8CADORj7GJx3SJyVAmCtKojpOoz1DnzFVeVWVSLj///+UV7GVWbK8GBjPTEPMQTjPTUXQUkrQSEGZUycXmg+WXbKfZ7qgarqbYraSVLCUV7HLPDTKNy7QUEjUYVrVY1zTXFXPRz2UVLmha7upeMCqecGlcb6aYLWfaLrLPjXLPjXSWFDVZF3VY1zVYlvRTkSaWKqlcr6qesGqecGpd8CdZbjo2+7LPTTKOS/QUUnVYlvVY1zUXVbPSD6TV7OibLuqecGqecGmc76aYbaibLvKOC/SWlPMQjrQUEjRVEzPS0PLPDL7WROZX7WgarqibLucY7eTVrCVWLLLOzLGLCLQT0bIMynKOC7FJx3MPjV/Vc+odsCRUa+SVLCDPaWVWLKWWrLJOzPHOTLKPDPLPDPLOzLLPDOUV6+UV7CVWLKVWLKUV7GUWLGPUqv///8iGqajAAAAp3RSTlMAAAAAAAAAAAAAABAZBAAAAABOx9uVFQAAAB/Y////eQAAADv0////pgEAAAAAGtD///9uAAAAAAAAAAcOQbPLfxgNAAAAAAA5sMyGGg1Ht8p6CwAAFMf///94H9j///xiAAAw7////65K+f///5gAABjQ////gibg////bAAAAEfD3JwaAFfK2o0RAAAAAA4aBQAAABEZAwAAAAAAAAAAAAAAAAAAAIvMfRYAAAA6SURBVAjXtcexEUBAFAXAfTM/IDH6uAbUqkItyAQYR26zDeS0UxieBvPVbArjXd9GS295raa/Gmu/A7zfBRgv03cCAAAAAElFTkSuQmCC) +![Julia 1.10.5](https://img.shields.io/badge/jill.sh_----lts-1.10.5-3a5fcc.svg?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAB+FBMVEUAAAA3lyU3liQ4mCY4mCY3lyU4lyY1liM3mCUskhlSpkIvkx0zlSEeigo5mSc8mio0liKPxYQ/nC5NozxQpUBHoDY3lyQ5mCc3lyY6mSg3lyVPpD9frVBgrVFZqUpEnjNgrVE3lyU8mio8mipWqEZhrVJgrVFfrE9JoTkAVAA3lyXJOjPMPjNZhCowmiNOoz1erE9grVFYqUhCnjFmk2KFYpqUV7KTWLDKOjK8CADORj7GJx3SJyVAmCtKojpOoz1DnzFVeVWVSLj///+UV7GVWbK8GBjPTEPMQTjPTUXQUkrQSEGZUycXmg+WXbKfZ7qgarqbYraSVLCUV7HLPDTKNy7QUEjUYVrVY1zTXFXPRz2UVLmha7upeMCqecGlcb6aYLWfaLrLPjXLPjXSWFDVZF3VY1zVYlvRTkSaWKqlcr6qesGqecGpd8CdZbjo2+7LPTTKOS/QUUnVYlvVY1zUXVbPSD6TV7OibLuqecGqecGmc76aYbaibLvKOC/SWlPMQjrQUEjRVEzPS0PLPDL7WROZX7WgarqibLucY7eTVrCVWLLLOzLGLCLQT0bIMynKOC7FJx3MPjV/Vc+odsCRUa+SVLCDPaWVWLKWWrLJOzPHOTLKPDPLPDPLOzLLPDOUV6+UV7CVWLKVWLKUV7GUWLGPUqv///8iGqajAAAAp3RSTlMAAAAAAAAAAAAAABAZBAAAAABOx9uVFQAAAB/Y////eQAAADv0////pgEAAAAAGtD///9uAAAAAAAAAAcOQbPLfxgNAAAAAAA5sMyGGg1Ht8p6CwAAFMf///94H9j///xiAAAw7////65K+f///5gAABjQ////gibg////bAAAAEfD3JwaAFfK2o0RAAAAAA4aBQAAABEZAwAAAAAAAAAAAAAAAAAAAIvMfRYAAAA6SURBVAjXtcexEUBAFAXAfTM/IDH6uAbUqkItyAQYR26zDeS0UxieBvPVbArjXd9GS295raa/Gmu/A7zfBRgv03cCAAAAAElFTkSuQmCC) ![Julia 1.11.0-rc4](https://img.shields.io/badge/jill.sh_----rc-1.11.0--rc4-3a5fcc.svg?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAB+FBMVEUAAAA3lyU3liQ4mCY4mCY3lyU4lyY1liM3mCUskhlSpkIvkx0zlSEeigo5mSc8mio0liKPxYQ/nC5NozxQpUBHoDY3lyQ5mCc3lyY6mSg3lyVPpD9frVBgrVFZqUpEnjNgrVE3lyU8mio8mipWqEZhrVJgrVFfrE9JoTkAVAA3lyXJOjPMPjNZhCowmiNOoz1erE9grVFYqUhCnjFmk2KFYpqUV7KTWLDKOjK8CADORj7GJx3SJyVAmCtKojpOoz1DnzFVeVWVSLj///+UV7GVWbK8GBjPTEPMQTjPTUXQUkrQSEGZUycXmg+WXbKfZ7qgarqbYraSVLCUV7HLPDTKNy7QUEjUYVrVY1zTXFXPRz2UVLmha7upeMCqecGlcb6aYLWfaLrLPjXLPjXSWFDVZF3VY1zVYlvRTkSaWKqlcr6qesGqecGpd8CdZbjo2+7LPTTKOS/QUUnVYlvVY1zUXVbPSD6TV7OibLuqecGqecGmc76aYbaibLvKOC/SWlPMQjrQUEjRVEzPS0PLPDL7WROZX7WgarqibLucY7eTVrCVWLLLOzLGLCLQT0bIMynKOC7FJx3MPjV/Vc+odsCRUa+SVLCDPaWVWLKWWrLJOzPHOTLKPDPLPDPLOzLLPDOUV6+UV7CVWLKVWLKUV7GUWLGPUqv///8iGqajAAAAp3RSTlMAAAAAAAAAAAAAABAZBAAAAABOx9uVFQAAAB/Y////eQAAADv0////pgEAAAAAGtD///9uAAAAAAAAAAcOQbPLfxgNAAAAAAA5sMyGGg1Ht8p6CwAAFMf///94H9j///xiAAAw7////65K+f///5gAABjQ////gibg////bAAAAEfD3JwaAFfK2o0RAAAAAA4aBQAAABEZAwAAAAAAAAAAAAAAAAAAAIvMfRYAAAA6SURBVAjXtcexEUBAFAXAfTM/IDH6uAbUqkItyAQYR26zDeS0UxieBvPVbArjXd9GS295raa/Gmu/A7zfBRgv03cCAAAAAElFTkSuQmCC) [Julia](https://julialang.org) light installer for Linux. @@ -69,7 +69,7 @@ By default, we use The following options are avaiable: - `-h, --help`: Show a help. -- `--lts`: Install the Long Term Support version (Currently 1.6.7). +- `--lts`: Install the Long Term Support version (Currently 1.10.5). - `--rc`: Install the latest release candidate (uses `jq` to query the versions from julialang.org). - `-u M.m, --upgrade M.m`: Copy environment from M.m version (e.g. -u 1.6) - `-v VER, --version VER`: Install julia version VER. Valid examples: 1.5.4, 1.5-latest, 1.5.0-rc1. diff --git a/ci-test.sh b/ci-test.sh index 6402f92..a9088d9 100644 --- a/ci-test.sh +++ b/ci-test.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +LTS=1.10.5 +LTS_FAMILY=$(echo "$LTS" | cut -d. -f1-2) + if [ -z "$VERSION" ]; then echo "Variable VERSION must be set" exit 1 @@ -36,12 +39,12 @@ $SUDO bash jill.sh -y msg "Installing Julia LTS version" $SUDO bash jill.sh -y --lts -[[ $(julia-1.6.7 -v) == "julia version 1.6.7" ]] +[[ $(julia-$LTS -v) == "julia version $LTS" ]] julia -e 'using Pkg; Pkg.update(); Pkg.add("Example")' msg "Upgrading to the latest Julia" -$SUDO bash jill.sh -y -u 1.6 +$SUDO bash jill.sh -y -u "$LTS_FAMILY" julia -e 'using Pkg; Pkg.status()' | grep Example julia -e 'using Pkg; Pkg.update()' # Issue 73 diff --git a/jill.sh b/jill.sh index d3cc531..4b7e21f 100755 --- a/jill.sh +++ b/jill.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -JULIA_LTS=1.6.7 +JULIA_LTS=1.10.5 JULIA_LATEST=1.11 function usage() { From 698072bb4a26d24cca1bf375f9afe85ee9936762 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 9 Oct 2024 11:01:09 +0200 Subject: [PATCH 7/7] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c5cdc7..e466d8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +### Changed + +- Julia LTS changed to 1.10.5 + ## [0.5.3] - 2024-01-04 ### Changed