Skip to content

Commit be65d89

Browse files
wow-such-codewow-such-code
authored
Merge pull request #64 from qbicsoftware/main
main to dev
2 parents cc1a2e4 + d9daee7 commit be65d89

File tree

13 files changed

+83
-51
lines changed

13 files changed

+83
-51
lines changed

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

‎.github/labeler.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
feature:
2+
- any:
3+
- head-branch: [ '^feature' ]
4+
fix:
5+
- any:
6+
- head-branch: [ '^fix', '^hotfix' ]
7+
chore:
8+
- any:
9+
- head-branch: [ '^chore', '^documentation', '^docs', '^ci', '^refactor' ]
10+
release:
11+
- all:
12+
- base-branch: [ 'main', 'master' ]
13+
- head-branch: [ 'development', 'dev' ]

‎.github/pr-labels.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/build-package.yml‎ renamed to ‎.github/workflows/build_package.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up JDK 1.8
18-
uses: actions/setup-java@v1
16+
- name: Checkout repository
17+
uses: actions/checkout@v3
18+
- name: Set up JDK 8
19+
uses: actions/setup-java@v3
1920
with:
20-
java-version: 1.8
21+
distribution: 'zulu'
22+
java-version: '8'
2123
- name: Load local Maven repository cache
22-
uses: actions/cache@v2
24+
uses: actions/cache@v3
2325
with:
2426
path: ~/.m2/repository
2527
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,16 @@ jobs:
3737

3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@v2
41-
- name: Set up JDK 1.8
42-
uses: actions/setup-java@v1
40+
uses: actions/checkout@v3
41+
- name: Set up JDK 8
42+
uses: actions/setup-java@v3
4343
with:
44-
java-version: 1.8
44+
distribution: 'zulu'
45+
java-version: '8'
4546
settings-path: ${{ github.workspace }}
4647

4748
- name: Load local Maven repository cache
48-
uses: actions/cache@v2
49+
uses: actions/cache@v3
4950
with:
5051
path: ~/.m2/repository
5152
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -54,7 +55,7 @@ jobs:
5455
5556
# Initializes the CodeQL tools for scanning.
5657
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@v1
58+
uses: github/codeql-action/init@v2
5859
with:
5960
languages: ${{ matrix.language }}
6061
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,7 +66,7 @@ jobs:
6566
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6667
# If this step fails, then you should remove it and run the build manually (see below)
6768
- name: Autobuild
68-
uses: github/codeql-action/autobuild@v1
69+
uses: github/codeql-action/autobuild@v2
6970

7071
# ℹ️ Command-line programs to run using the OS shell.
7172
# 📚 https://git.io/JvXDl
@@ -79,4 +80,4 @@ jobs:
7980
# make release
8081

8182
- name: Perform CodeQL Analysis
82-
uses: github/codeql-action/analyze@v1
83+
uses: github/codeql-action/analyze@v2

‎.github/workflows/create-release.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ jobs:
1111
release:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- name: Set up JDK 1.8
16-
uses: actions/setup-java@v1
14+
- name: Checkout repository
15+
uses: actions/checkout@v3
16+
- name: Set up JDK 8
17+
uses: actions/setup-java@v3
1718
with:
18-
java-version: 1.8
19+
distribution: 'zulu'
20+
java-version: '8'
1921
settings-path: ${{ github.workspace }}
2022

2123
- name: Load local Maven repository cache
22-
uses: actions/cache@v2
24+
uses: actions/cache@v3
2325
with:
2426
path: ~/.m2/repository
2527
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -42,7 +44,7 @@ jobs:
4244
&& !( contains(github.event.inputs.versionTag, 'alpha')
4345
|| contains(github.event.inputs.versionTag, 'beta')
4446
|| contains(github.event.inputs.versionTag, 'rc')) }}
45-
uses: actions/github-script@v4.0.2
47+
uses: actions/github-script@v6
4648
with:
4749
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
4850
script: |
@@ -56,7 +58,7 @@ jobs:
5658
&& ( contains(github.event.inputs.versionTag, 'alpha')
5759
|| contains(github.event.inputs.versionTag, 'beta')
5860
|| contains(github.event.inputs.versionTag, 'rc')) }}
59-
uses: actions/github-script@v4.0.2
61+
uses: actions/github-script@v6
6062
with:
6163
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
6264
script: |
@@ -85,12 +87,12 @@ jobs:
8587
run: git push
8688

8789
- name: Open PR with version bump
88-
uses: actions/github-script@v4.0.2
90+
uses: actions/github-script@v6
8991
with:
9092
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
9193
script: |
9294
await github.request(`POST /repos/${{ github.repository }}/pulls`, {
9395
title: 'Update version to ${{ github.event.inputs.versionTag }}',
9496
head: 'release/set-version-to-${{ github.event.inputs.versionTag }}',
95-
base: 'master'
97+
base: 'main'
9698
});

‎.github/workflows/label-pull-requests.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
name: Label Pull Requests
22

3+
permissions:
4+
contents: read
5+
pull-requests: write
6+
37
on:
48
pull_request:
59
types: [ opened, edited ]
610

711
jobs:
8-
label:
12+
Assign-Label-To-Pull-Request:
913
runs-on: ubuntu-latest
1014
steps:
11-
- uses: TimonVS/pr-labeler-action@v3
15+
- uses: actions/labeler@v5.0.0-alpha.1
1216
with:
13-
configuration-path: .github/pr-labels.yml # optional, .github/pr-labeler.yml is the default value
14-
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/nexus-publish-snapshots.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v1
18+
- name: Checkout repository
19+
uses: actions/checkout@v3
20+
- name: Set up JDK 8
21+
uses: actions/setup-java@v3
2122
with:
22-
java-version: 1.8
23+
distribution: 'zulu'
24+
java-version: '8'
2325
settings-path: ${{ github.workspace }}
2426

2527
- name: Load local Maven repository cache
26-
uses: actions/cache@v2
28+
uses: actions/cache@v3
2729
with:
2830
path: ~/.m2/repository
2931
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/run-tests.yml‎ renamed to ‎.github/workflows/run_tests.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up JDK 1.8
18-
uses: actions/setup-java@v1
16+
- name: Checkout repository
17+
uses: actions/checkout@v3
18+
- name: Set up JDK 8
19+
uses: actions/setup-java@v3
1920
with:
20-
java-version: 1.8
21+
distribution: 'zulu'
22+
java-version: '8'
23+
settings-path: ${{ github.workspace }}
2124

2225
- name: Load local Maven repository cache
23-
uses: actions/cache@v2
26+
uses: actions/cache@v3
2427
with:
2528
path: ~/.m2/repository
2629
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>projectwizard-portlet</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.13.0-SNAPSHOT</version>
8+
<version>1.13.1</version>
99
<name>ProjectWizard Portlet</name>
1010
<url>https://github.com/qbicsoftware/projectwizard-portlet</url>
1111
<description>Creates hierarchical experiments using factorial design.</description>

0 commit comments

Comments
 (0)