From e3c95eb0beb7af6214833642bacc6c0e9fc6c079 Mon Sep 17 00:00:00 2001 From: Jakub Nowosad Date: Mon, 23 Sep 2024 09:39:53 +0200 Subject: [PATCH 1/4] Update main_new.yaml --- .github/workflows/main_new.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main_new.yaml b/.github/workflows/main_new.yaml index de9bc80..1f8ea2c 100644 --- a/.github/workflows/main_new.yaml +++ b/.github/workflows/main_new.yaml @@ -11,6 +11,8 @@ jobs: permissions: contents: write statuses: write + env: + QUARTO_JULIA_PROJECT: "@quarto" steps: - uses: actions/checkout@v3 - uses: julia-actions/setup-julia@v2 @@ -42,4 +44,4 @@ jobs: uses: quarto-dev/quarto-actions/publish@v2 with: target: netlify - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} \ No newline at end of file + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} From 6d39e8616a3c456604eda06dc96b083083d9f026 Mon Sep 17 00:00:00 2001 From: Jakub Nowosad Date: Mon, 23 Sep 2024 09:40:04 +0200 Subject: [PATCH 2/4] Update pr.yaml --- .github/workflows/pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e170eb2..3976991 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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 From 57afcee3167800e237b34d8f4a22f39077e12c6e Mon Sep 17 00:00:00 2001 From: Jakub Nowosad Date: Mon, 23 Sep 2024 10:05:35 +0200 Subject: [PATCH 3/4] Update 01-spatial-data.qmd --- chapters/01-spatial-data.qmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapters/01-spatial-data.qmd b/chapters/01-spatial-data.qmd index dac29fa..44af128 100644 --- a/chapters/01-spatial-data.qmd +++ b/chapters/01-spatial-data.qmd @@ -20,7 +20,7 @@ mkpath("output") ## Introduction ```{julia} using GeoDataFrames -df = GeoDataFrames.read("../data/world.gpkg") +df = GeoDataFrames.read("data/world.gpkg") ``` ```{julia} From 65cdae8c0a265fa6cfb9a945d54fae4e8254a7c3 Mon Sep 17 00:00:00 2001 From: Jakub Nowosad Date: Mon, 23 Sep 2024 10:36:02 +0200 Subject: [PATCH 4/4] cleans gha workflows --- .github/workflows/_old_main.yaml | 47 +++++++++++++++++ .github/workflows/main.yaml | 90 ++++++++++++++++---------------- .github/workflows/main_new.yaml | 47 ----------------- 3 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 .github/workflows/_old_main.yaml delete mode 100644 .github/workflows/main_new.yaml diff --git a/.github/workflows/_old_main.yaml b/.github/workflows/_old_main.yaml new file mode 100644 index 0000000..51ff7bd --- /dev/null +++ b/.github/workflows/_old_main.yaml @@ -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" diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 51ff7bd..1f8ea2c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -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 }} diff --git a/.github/workflows/main_new.yaml b/.github/workflows/main_new.yaml deleted file mode 100644 index 1f8ea2c..0000000 --- a/.github/workflows/main_new.yaml +++ /dev/null @@ -1,47 +0,0 @@ -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: Render and Publish - uses: quarto-dev/quarto-actions/publish@v2 - with: - target: netlify - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}