Skip to content

Commit 6f27a4e

Browse files
committed
Merge branch 'main' into release
2 parents f2673ab + 868465e commit 6f27a4e

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- main
77
- develop
88
- release
9+
tags:
10+
- 'v*'
911
paths-ignore:
1012
- "README.md"
1113
pull_request:

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
# Override automatic language detection by changing the below list
2121
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
22-
language: ['java']
22+
language: ['java-kotlin']
2323
# Learn more...
2424
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
2525

@@ -31,6 +31,13 @@ jobs:
3131
# a pull request then we can checkout the head.
3232
fetch-depth: 2
3333

34+
- name: Set up JDK 17
35+
uses: actions/setup-java@v5
36+
with:
37+
java-version: '17'
38+
distribution: 'zulu'
39+
cache: 'maven'
40+
3441
# Initializes the CodeQL tools for scanning.
3542
- name: Initialize CodeQL
3643
uses: github/codeql-action/init@v4

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
workflows:
66
- Build
77
branches:
8-
- release
8+
- 'v*'
99
types:
1010
- completed
1111

@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v7
2626
with:
27-
ref: release
27+
ref: ${{ github.event.workflow_run.head_branch }}
2828
- uses: fregante/setup-git-user@v2
2929
- name: Set up JDK 11
3030
uses: actions/setup-java@v5

0 commit comments

Comments
 (0)