Skip to content

Commit 7d2f8ca

Browse files
committed
Merge branch 'master' into develop
2 parents c7432cd + 4f4e56f commit 7d2f8ca

File tree

3 files changed

+74
-1
lines changed

3 files changed

+74
-1
lines changed
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
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: '17 4 * * 6'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'cpp', 'python' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v2
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v1
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+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
52+
53+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54+
# If this step fails, then you should remove it and run the build manually (see below)
55+
- name: Autobuild
56+
uses: github/codeql-action/autobuild@v1
57+
58+
# ℹ️ Command-line programs to run using the OS shell.
59+
# 📚 https://git.io/JvXDl
60+
61+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62+
# and modify them (or add more) to build your code if your project
63+
# uses a compiled language
64+
65+
#- run: |
66+
# make bootstrap
67+
# make release
68+
69+
- name: Perform CodeQL Analysis
70+
uses: github/codeql-action/analyze@v1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Modify the following lines to match your needs
2525

2626
# Installation directory
27-
BINDIR=/develop
27+
BINDIR=/usr/local/bin
2828

2929
# Libraries
3030
GDAL=-I/usr/include/gdal -L/usr/lib -Wl,-rpath=/usr/lib

docs/source/refs-applied.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ This list summarizes all scientific publications that have used FORCE. If you ha
2828
| J. Kreyling, F. Tanneberger, F. Jansen, S. van der Linden, C. Aggenbach, V. Blüml, J. Couwenberg, W-J Emsens, H. Joosten, A. Klimkowska, W. Kotowski, L. Kozub, B. Lennartz, Y. Liczner, H. Liu, D. Michaelis, C. Oehmke, K. Parakenings, E. Pleyl, A. Poyda, S. Raabe, M. Röhl, K. Rücker, A. Schneider, J. Schrautzer, C. Schröder, F. Schug, E. Seeber, F. Thiel, S. Thiele, B. Tiemeyer, T. Timmermann, T. Urich, R. van Diggelen, K. Vegelin, E. Verbruggen, M. Wilmking, N. Wrage-Mönnig, L. Wołejko, D. Zak, and G. Jurasinski (2021): Rewetting does not return drained fen peatlands to their old selves. Nature Communications 12, 5693.
2929
| https://doi.org/10.1038/s41467-021-25619-y
3030
31+
| F. Lobert, A.-K. Holtgrave, M. Schwieder, M. Pause, J. Vogt, A. Gocht, and S. Erasmi (2021): Mowing event detection in permanent grasslands: Systematic evaluation of input features from Sentinel-1, Sentinel-2, and Landsat 8 time series. Remote Sensing of Environment 267, 112751.
32+
| https://doi.org/10.1016/j.rse.2021.112751
33+
3134
| A. Okujeni, C. Jänicke, S. Cooper, D. Frantz, P. Hostert, M. Clark, K. Segl, and S. van der Linden (2021): Multi-season unmixing of vegetation class fractions across diverse Californian ecoregions using simulated spaceborne imaging spectroscopy data. Remote Sensing of Environment 264, 112558.
3235
| https://doi.org/10.1016/j.rse.2021.112558
3336

0 commit comments

Comments
 (0)