Skip to content

Commit

Permalink
Merge branch 'main' into codemirror-savq
Browse files Browse the repository at this point in the history
  • Loading branch information
fonsp committed Jan 3, 2025
2 parents 40bd934 + caf7456 commit 535f44a
Show file tree
Hide file tree
Showing 66 changed files with 3,253 additions and 11,338 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/Bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# Do the actual bundling
- uses: actions/setup-node@v4
with:
node-version: 17.x
node-version: 22.x
cache: "npm"
cache-dependency-path: frontend-bundler/package-lock.json

Expand All @@ -60,7 +60,12 @@ jobs:
working-directory: frontend-bundler
run: |
(npm run build) || (npm run build) || (npm run build)
- name: List generated files
working-directory: frontend-dist
run: |
ls -lha
- name: Check for corrupt files
working-directory: frontend-dist
run: |
Expand Down
23 changes: 2 additions & 21 deletions .github/workflows/FrontendTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
- uses: actions/checkout@v4

# Makes thes `julia` command available
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: "1.6" # our lowest supported version
version: "1.10" # our lowest supported version

- name: Install Pluto.jl packages
run: |
Expand All @@ -38,27 +38,10 @@ jobs:
with:
node-version: "18.x"

- name: Install Chrome dependencies
run: |
sudo apt-get update
# See https://crbug.com/795759
sudo apt-get install -yq libgconf-2-4
# Install latest chrome dev package, which installs the necessary libs to
# make the bundled version of Chromium that Puppeteer installs work.
sudo apt-get install -y wget --no-install-recommends
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
sudo apt-get update
sudo apt-get install -y google-chrome-stable --no-install-recommends
sudo rm -rf /var/lib/apt/lists/*
- name: Install dependencies
working-directory: ./test/frontend
run: |
npm install
env:
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"
PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
- name: Run tests
working-directory: ./test/frontend
Expand All @@ -80,8 +63,6 @@ jobs:
env:
PLUTO_PORT: 1235
PLUTO_TEST_OFFLINE: ${{ github.ref_name == 'release' }}
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"
PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"

- uses: actions/upload-artifact@v4
if: failure()
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/IntegrationTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
test:
name: ${{ matrix.package.repo }}
runs-on: ${{ matrix.os }}
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/LaunchTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
strategy:
matrix:
# We test quite a lot of versions because we do some OS and version specific things unfortunately
julia-version: ["1.6", "1.7"]
julia-version: ["lts", "1"]
os: [windows-latest, ubuntu-latest]

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4

# Makes thes `julia` command available
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
fail-fast: false
matrix:
# We test quite a lot of versions because we do some OS and version specific things unfortunately
julia-version: ["1.6", "1.10", "1.11"] #, "nightly"] # "~1.12.0-0"]
julia-version: ["1.10", "1.11"] #, "nightly"] # "~1.12.0-0"]
os: [ubuntu-latest, macOS-latest, windows-latest]

steps:
Expand All @@ -45,9 +45,9 @@ jobs:
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
arch: ${{ (matrix.julia-version == '1.6') && 'x64' || runner.arch }}
arch: ${{ runner.arch }}

- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2

# 🚗
- uses: julia-actions/julia-runtest@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/TestBundledExport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: "1.8"
version: "1.10"

- name: Generate exports and check for warnings
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/TestFirefox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- uses: actions/checkout@v4

# Makes thes `julia` command available
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: "1.6" # our lowest supported version
version: "1.10" # our lowest supported version
arch: x64

- name: Install Pluto.jl packages
Expand Down
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "Pluto"
uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
license = "MIT"
authors = ["Fons van der Plas <[email protected]>"]
version = "0.19.47"
version = "0.20.4"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down Expand Up @@ -48,12 +48,12 @@ HypertextLiteral = "0.7, 0.8, 0.9"
InteractiveUtils = "1"
Logging = "1"
LoggingExtras = "0.4, 1"
MIMEs = "0.1"
MIMEs = "0.1, 1"
Malt = "1.1"
Markdown = "1"
MsgPack = "1.1"
Pkg = "1"
PlutoDependencyExplorer = "~1.0"
PlutoDependencyExplorer = "~1.2"
PrecompileSignatures = "3"
PrecompileTools = "=1.2.1"
REPL = "1"
Expand All @@ -65,7 +65,7 @@ TOML = "1"
Tables = "1"
URIs = "1.3"
UUIDs = "1"
julia = "^1.6"
julia = "^1.10"

[extras]
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Expand Down
2 changes: 1 addition & 1 deletion frontend-bundler/.parcelrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"..."
],
"reporters": [
"...",
"...",
"parcel-reporter-bundle-manifest"
]
}
Loading

0 comments on commit 535f44a

Please sign in to comment.