Skip to content
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
2 changes: 1 addition & 1 deletion .github/actions/collect_artefacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ runs:
using: "composite"
steps:
- name: upload core dumps
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v6
with:
name: core-dumps
path: /tmp/core_dumps
2 changes: 1 addition & 1 deletion .github/actions/init-python-env/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
steps:
- name: Load cached Poetry installation
id: cached-poetry
uses: actions/cache@v3
uses: actions/cache@v5
with:
path: ~/.local # the path depends on the OS, this is linux
key: poetry-${{inputs.poetry_version}}-0 # increment to reset cache
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/init-scala-env/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: setup scala environment
runs:
using: "composite"
steps:
- uses: coursier/cache-action@v6
- uses: coursier/setup-action@v1
- uses: coursier/cache-action@v7
- uses: coursier/setup-action@v2
with:
jvm: zulu:8.0.362
apps: sbt
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:

build-scala:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
matrix:
Expand All @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -52,15 +52,15 @@ jobs:
run: make build-scala

- name: Cache Spark Assembly
uses: actions/cache@v3
uses: actions/cache@v5
with:
path: ./dist/*
key: dist-${{ matrix.spark_version }}-${{ github.sha }}

build-python:
# scala/* branches are not supposed to change python code, trust them
if: ${{ !startsWith(github.event.inputs.from_branch, 'scala/') }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: build-scala

strategy:
Expand All @@ -75,7 +75,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -88,7 +88,7 @@ jobs:
shell: bash
run: make lint-python

- uses: actions/cache@v3
- uses: actions/cache@v5
with:
path: ./dist/*
key: dist-${{ matrix.spark_version }}-${{ github.sha }}
Expand All @@ -102,7 +102,7 @@ jobs:
publish-scala:
name: Publish Scala Artifacts
needs: [ build-scala, build-python ]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: (github.event_name != 'pull_request') && startsWith(github.ref, 'refs/tags/v')

strategy:
Expand All @@ -114,7 +114,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -135,7 +135,7 @@ jobs:
run: make build-scala

- name: Cache Spark Assembly
uses: actions/cache@v3
uses: actions/cache@v5
with:
path: ./dist/*
key: dist-${{ matrix.spark_version }}-${{ github.ref }}
Expand All @@ -144,7 +144,7 @@ jobs:
publish-python:
name: Publish Scala Artifacts
needs: [ publish-scala ]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: (github.event_name != 'pull_request') && startsWith(github.ref, 'refs/tags/v')

strategy:
Expand All @@ -159,7 +159,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -168,7 +168,7 @@ jobs:
python_version: ${{ matrix.python }}
spark_version: ${{ matrix.spark_version }}

- uses: actions/cache@v3
- uses: actions/cache@v5
with:
path: ./dist/*
key: dist-${{ matrix.spark_version }}-${{ github.ref }}
Expand All @@ -182,7 +182,7 @@ jobs:
# uses: ./.github/actions/upload_artefacts

# TODO: Where does this go, do we need it?
# - uses: actions/cache@v3
# - uses: actions/cache@v5
# with:
# path: ./dist/*
# key: dist-${{ github.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ on:

jobs:
docs:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container:
image: s22s/debian-openjdk-conda-gdal:6790f8d

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: coursier/cache-action@v6
- uses: coursier/cache-action@v7
- uses: olafurpg/setup-scala@v13
with:
java-version: [email protected]
Expand Down