Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update lts #101

Merged
merged 7 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
inverval: "weekly"
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: CI

on:
push:
branches: [ main ]
branches: [main]
tags: ["*"]
pull_request:
branches: [ main ]
branches: [main]

workflow_dispatch:

Expand All @@ -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 }}
Expand Down
54 changes: 45 additions & 9 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -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
with:
python-version: 3.x
- name: Cache pre-commit
uses: actions/cache@v4
with:
path: ~/.cache/pre-commit
key: ${{ runner.os }}-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}

- 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: Install and run pre-commit
run: |
pip install pre-commit
pre-commit run -a
- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@v1
with:
fail: true
args: --config '.lychee.toml' .
12 changes: 8 additions & 4 deletions .github/workflows/update-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,24 @@ 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
run: which julia
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'
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")'
Expand All @@ -38,7 +42,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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
8 changes: 8 additions & 0 deletions .lychee.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
exclude = [
"@ref",
"^https://github.com/.*/releases/tag/v.*$",
"^https://github.com/.*/compare/v.*HEAD$"
]

exclude_path = [
]
31 changes: 27 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rules:
indentation: { spaces: 2 }
7 changes: 1 addition & 6 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -99,7 +103,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.

<!-- markdown-link-check-disable -->
[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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
7 changes: 5 additions & 2 deletions ci-test.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down
Loading