Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/cover
Browse files Browse the repository at this point in the history
  • Loading branch information
asinghvi17 committed Sep 23, 2024
2 parents dee5d32 + 65cdae8 commit 7c97dae
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 91 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/_old_main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# on:
# workflow_dispatch:
# push:
# branches:
# [main]
# pull_request:
# name: Quarto Publish
# jobs:
# bookdown:
# name: GH-Pages
# runs-on: ubuntu-latest
# permissions:
# contents: write
# statuses: write
# steps:
# - uses: actions/checkout@v3
# - uses: julia-actions/setup-julia@v2
# - uses: julia-actions/cache@v2
# - name: Set up custom Julia dependencies
# run: |
# using Pkg
# Pkg.activate("quarto"; shared = true)
# # TODO: QuartoNotebookRunner does not support execute-dir yet, but this PR does.
# Pkg.add(url = "https://github.com/asinghvi17/QuartoNotebookRunner.jl", rev = "as/execute-dir")
# Pkg.instantiate()
# Pkg.activate(".")
# Pkg.add([
# # TODO: DimensionalData v0.28 is not compatible with Rasters latest version,
# # and has Makie fixes that we need for the book, otherwise plotting errors out.
# # These can be removed after Rasters.jl's new breaking version.
# PackageSpec(url = "https://github.com/asinghvi17/Rasters.jl", rev = "as/dd28"),
# PackageSpec(url = "https://github.com/rafaqz/DimensionalData.jl", rev = "main"),
# ])
# shell: julia {0}
# - uses: julia-actions/julia-buildpkg@v1

# - name: Set up Quarto
# uses: quarto-dev/quarto-actions/setup@v2
# env:
# QUARTO_JULIA_PROJECT: "@quarto"

# - name: Render and Publish
# run: julia helpers/deploy_with_preview.jl
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# QUARTO_JULIA_PROJECT: "@quarto"
# DATAFRAMES_ROWS: "6"
90 changes: 45 additions & 45 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
# on:
# workflow_dispatch:
# push:
# branches:
# [main]
# pull_request:
# name: Quarto Publish
# jobs:
# bookdown:
# name: GH-Pages
# runs-on: ubuntu-latest
# permissions:
# contents: write
# statuses: write
# steps:
# - uses: actions/checkout@v3
# - uses: julia-actions/setup-julia@v2
# - uses: julia-actions/cache@v2
# - name: Set up custom Julia dependencies
# run: |
# using Pkg
# Pkg.activate("quarto"; shared = true)
# # TODO: QuartoNotebookRunner does not support execute-dir yet, but this PR does.
# Pkg.add(url = "https://github.com/asinghvi17/QuartoNotebookRunner.jl", rev = "as/execute-dir")
# Pkg.instantiate()
# Pkg.activate(".")
# Pkg.add([
# # TODO: DimensionalData v0.28 is not compatible with Rasters latest version,
# # and has Makie fixes that we need for the book, otherwise plotting errors out.
# # These can be removed after Rasters.jl's new breaking version.
# PackageSpec(url = "https://github.com/asinghvi17/Rasters.jl", rev = "as/dd28"),
# PackageSpec(url = "https://github.com/rafaqz/DimensionalData.jl", rev = "main"),
# ])
# shell: julia {0}
# - uses: julia-actions/julia-buildpkg@v1
on:
workflow_dispatch:
push:
branches:
[main]
name: Quarto Publish
jobs:
quarto:
name: GH-Pages
runs-on: ubuntu-latest
permissions:
contents: write
statuses: write
env:
QUARTO_JULIA_PROJECT: "@quarto"
steps:
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v2
- uses: julia-actions/cache@v2
- name: Set up custom Julia dependencies
run: |
using Pkg
Pkg.activate("quarto"; shared = true)
# TODO: QuartoNotebookRunner does not support execute-dir yet, but this PR does.
Pkg.add(url = "https://github.com/asinghvi17/QuartoNotebookRunner.jl", rev = "as/execute-dir")
Pkg.instantiate()
Pkg.activate(".")
Pkg.add([
# TODO: DimensionalData v0.28 is not compatible with Rasters latest version,
# and has Makie fixes that we need for the book, otherwise plotting errors out.
# These can be removed after Rasters.jl's new breaking version.
PackageSpec(url = "https://github.com/asinghvi17/Rasters.jl", rev = "as/dd28"),
PackageSpec(url = "https://github.com/rafaqz/DimensionalData.jl", rev = "main"),
])
shell: julia {0}
- uses: julia-actions/julia-buildpkg@v1

# - name: Set up Quarto
# uses: quarto-dev/quarto-actions/setup@v2
# env:
# QUARTO_JULIA_PROJECT: "@quarto"
- name: Set up Quarto
uses: quarto-dev/quarto-actions/setup@v2
env:
QUARTO_JULIA_PROJECT: "@quarto"

# - name: Render and Publish
# run: julia helpers/deploy_with_preview.jl
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# QUARTO_JULIA_PROJECT: "@quarto"
# DATAFRAMES_ROWS: "6"
- name: Render and Publish
uses: quarto-dev/quarto-actions/publish@v2
with:
target: netlify
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
45 changes: 0 additions & 45 deletions .github/workflows/main_new.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
statuses: write
pull-requests: write
deployments: write
env:
QUARTO_JULIA_PROJECT: "@quarto"
steps:
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v2
Expand Down
2 changes: 1 addition & 1 deletion chapters/01-spatial-data.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mkpath("output")
## Introduction
```{julia}
using GeoDataFrames
df = GeoDataFrames.read("../data/world.gpkg")
df = GeoDataFrames.read("data/world.gpkg")
```

```{julia}
Expand Down

0 comments on commit 7c97dae

Please sign in to comment.