Skip to content

Commit

Permalink
Merge branch 'main' into release/set-version-to-1.13.1
Browse files Browse the repository at this point in the history
  • Loading branch information
wow-such-code authored Jul 12, 2023
2 parents 196f133 + bab3251 commit 3a8ac33
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 40 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
13 changes: 13 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
feature:
- any:
- head-branch: [ '^feature' ]
fix:
- any:
- head-branch: [ '^fix', '^hotfix' ]
chore:
- any:
- head-branch: [ '^chore', '^documentation', '^docs', '^ci', '^refactor' ]
release:
- all:
- base-branch: [ 'main', 'master' ]
- head-branch: [ 'development', 'dev' ]
3 changes: 0 additions & 3 deletions .github/pr-labels.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'zulu'
java-version: '8'
- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'zulu'
java-version: '8'
settings-path: ${{ github.workspace }}

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
20 changes: 11 additions & 9 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'zulu'
java-version: '8'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -42,7 +44,7 @@ jobs:
&& !( contains(github.event.inputs.versionTag, 'alpha')
|| contains(github.event.inputs.versionTag, 'beta')
|| contains(github.event.inputs.versionTag, 'rc')) }}
uses: actions/github-script@v4.0.2
uses: actions/github-script@v6
with:
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
script: |
Expand All @@ -56,7 +58,7 @@ jobs:
&& ( contains(github.event.inputs.versionTag, 'alpha')
|| contains(github.event.inputs.versionTag, 'beta')
|| contains(github.event.inputs.versionTag, 'rc')) }}
uses: actions/github-script@v4.0.2
uses: actions/github-script@v6
with:
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
script: |
Expand Down Expand Up @@ -85,12 +87,12 @@ jobs:
run: git push

- name: Open PR with version bump
uses: actions/github-script@v4.0.2
uses: actions/github-script@v6
with:
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
script: |
await github.request(`POST /repos/${{ github.repository }}/pulls`, {
title: 'Update version to ${{ github.event.inputs.versionTag }}',
head: 'release/set-version-to-${{ github.event.inputs.versionTag }}',
base: 'master'
base: 'main'
});
12 changes: 7 additions & 5 deletions .github/workflows/label-pull-requests.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
name: Label Pull Requests

permissions:
contents: read
pull-requests: write

on:
pull_request:
types: [ opened, edited ]

jobs:
label:
Assign-Label-To-Pull-Request:
runs-on: ubuntu-latest
steps:
- uses: TimonVS/pr-labeler-action@v3
- uses: actions/labeler@v5.0.0-alpha.1
with:
configuration-path: .github/pr-labels.yml # optional, .github/pr-labeler.yml is the default value
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
repo-token: "${{ secrets.GITHUB_TOKEN }}"
12 changes: 7 additions & 5 deletions .github/workflows/nexus-publish-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'zulu'
java-version: '8'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'zulu'
java-version: '8'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down

0 comments on commit 3a8ac33

Please sign in to comment.