Skip to content

Commit 52a2374

Browse files
giswqsgiswqs
authored
Merge branch 'master' into maint/bump-localtileserver
2 parents e834d71 + 727f4db commit 52a2374

11 files changed

+83
-84
lines changed

‎.github/workflows/codeql.yml

+49-50
Original file line numberDiff line numberDiff line change
@@ -12,63 +12,62 @@
1212
name: "CodeQL"
1313

1414
on:
15-
push:
16-
branches: [ "master" ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ "master" ]
20-
schedule:
21-
- cron: '15 20 * * 1'
15+
push:
16+
branches: ["master"]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: ["master"]
20+
schedule:
21+
- cron: "15 20 * * 1"
2222

2323
jobs:
24-
analyze:
25-
name: Analyze
26-
runs-on: ubuntu-latest
27-
permissions:
28-
actions: read
29-
contents: read
30-
security-events: write
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
3131

32-
strategy:
33-
fail-fast: false
34-
matrix:
35-
language: [ 'python' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: ["python"]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3838

39-
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v3
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v4
4242

43-
# Initializes the CodeQL tools for scanning.
44-
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
46-
with:
47-
languages: ${{ matrix.language }}
48-
# If you wish to specify custom queries, you can do so here or in a config file.
49-
# By default, queries listed here will override any specified in a config file.
50-
# Prefix the list here with "+" to use these queries and those in the config file.
51-
52-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53-
# queries: security-extended,security-and-quality
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v2
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
5451

55-
56-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
57-
# If this step fails, then you should remove it and run the build manually (see below)
58-
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
52+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53+
# queries: security-extended,security-and-quality
6054

61-
# ℹ️ Command-line programs to run using the OS shell.
62-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
55+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
56+
# If this step fails, then you should remove it and run the build manually (see below)
57+
- name: Autobuild
58+
uses: github/codeql-action/autobuild@v2
6359

64-
# If the Autobuild fails above, remove it and uncomment the following three lines.
65-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
60+
# ℹ️ Command-line programs to run using the OS shell.
61+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6662

67-
# - run: |
68-
# echo "Run, Build Application using script"
69-
# ./location_of_script_within_repo/buildscript.sh
63+
# If the Autobuild fails above, remove it and uncomment the following three lines.
64+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
7065

71-
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
73-
with:
74-
category: "/language:${{matrix.language}}"
66+
# - run: |
67+
# echo "Run, Build Application using script"
68+
# ./location_of_script_within_repo/buildscript.sh
69+
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v2
72+
with:
73+
category: "/language:${{matrix.language}}"

‎.github/workflows/dependency-review.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#
55
# Source repository: https://github.com/actions/dependency-review-action
66
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
7-
name: 'Dependency Review'
7+
name: "Dependency Review"
88
on: [pull_request]
99

1010
permissions:
11-
contents: read
11+
contents: read
1212

1313
jobs:
14-
dependency-review:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: 'Checkout Repository'
18-
uses: actions/checkout@v3
19-
- name: 'Dependency Review'
20-
uses: actions/dependency-review-action@v2
14+
dependency-review:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: "Checkout Repository"
18+
uses: actions/checkout@v4
19+
- name: "Dependency Review"
20+
uses: actions/dependency-review-action@v2

‎.github/workflows/docker-image.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Docker Image CI
22

33
on:
4-
push:
5-
branches: ["master"]
6-
pull_request:
7-
branches: ["master"]
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
88

99
jobs:
10-
build:
11-
runs-on: ubuntu-latest
10+
build:
11+
runs-on: ubuntu-latest
1212

13-
steps:
14-
- uses: actions/checkout@v3
15-
- name: Build the Docker image
16-
run: docker build . --file Dockerfile --tag ${{ github.repository }}:$(date +%s)
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: Build the Docker image
16+
run: docker build . --file Dockerfile --tag ${{ github.repository }}:$(date +%s)

‎.github/workflows/docker-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
contents: read
1414
steps:
1515
- name: Check out the repo
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Log in to Docker Hub
1919
uses: docker/login-action@v2

‎.github/workflows/docs-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
3030
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333

3434
- name: Setup Python
35-
uses: conda-incubator/setup-miniconda@v2
35+
uses: conda-incubator/setup-miniconda@v3
3636
with:
3737
auto-activate-base: true
3838
python-version: ${{ matrix.python-version }}

‎.github/workflows/docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- name: Setup Python
34-
uses: conda-incubator/setup-miniconda@v2
34+
uses: conda-incubator/setup-miniconda@v3
3535
with:
3636
auto-activate-base: true
3737
python-version: ${{ matrix.python-version }}

‎.github/workflows/installation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
matrix:
1616
python-version: ["3.11"]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Set up Python
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323
- name: Install package

‎.github/workflows/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
2121
steps:
2222
- name: CHECKOUT CODE
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: SETUP PYTHON
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.config.py }}
2828
- name: Install package

‎.github/workflows/pypi.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up Python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.x"
2020
- name: Install dependencies

‎.github/workflows/ubuntu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
3232

3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535

3636
- name: Setup Python
37-
uses: conda-incubator/setup-miniconda@v2
37+
uses: conda-incubator/setup-miniconda@v3
3838
with:
3939
auto-activate-base: true
4040
python-version: ${{ matrix.python-version }}

‎.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
shell: bash -el {0}
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323

2424
- name: Setup Python
25-
uses: conda-incubator/setup-miniconda@v2
25+
uses: conda-incubator/setup-miniconda@v3
2626
with:
2727
auto-activate-base: true
2828
python-version: ${{ matrix.python-version }}

0 commit comments

Comments
 (0)