Skip to content

Commit 5e6048c

Browse files
authored
Merge pull request #625 from leerho/main
Repair all GitHub workflows
2 parents 7dfbf54 + b5d2d04 commit 5e6048c

5 files changed

Lines changed: 69 additions & 69 deletions

File tree

.github/workflows/auto-jdk-matrix.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: DataSketches-Java Auto JDK Matrix Test & Install
1+
name: Auto JDK Matrix Test & Install
22

33
on:
44
push:
@@ -23,10 +23,10 @@ jobs:
2323
matrix:
2424
jdk: [ 17 ]
2525

26-
env:
27-
JDK_VERSION: ${{ matrix.jdk }}
26+
env:
27+
JDK_VERSION: ${{ matrix.jdk }}
2828

29-
steps:
29+
steps:
3030
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
3131
uses: actions/checkout@v4
3232
with:

.github/workflows/auto-os-matrix.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: DataSketches-Java Auto OS Matrix Test & Install
1+
name: Auto OS Matrix Test & Install
22

33
on:
44
push:
@@ -40,42 +40,42 @@ jobs:
4040
JDK_VERSION: ${{ matrix.jdk }}
4141

4242
steps:
43-
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
44-
uses: actions/checkout@v4
45-
with:
46-
persist-credentials: false
43+
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
44+
uses: actions/checkout@v4
45+
with:
46+
persist-credentials: false
4747

48-
- name: Cache local Maven repository
49-
uses: actions/cache@v4
50-
with:
51-
path: ~/.m2/repository
52-
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
53-
restore-keys: build-${{ runner.os }}-maven-
48+
- name: Cache local Maven repository
49+
uses: actions/cache@v4
50+
with:
51+
path: ~/.m2/repository
52+
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
53+
restore-keys: build-${{ runner.os }}-maven-
5454

55-
- name: Install Matrix JDK
56-
uses: actions/setup-java@v4
57-
with:
58-
java-version: ${{ matrix.jdk }}
59-
distribution: 'temurin'
60-
java-package: jdk
61-
architecture: x64
55+
- name: Install Matrix JDK
56+
uses: actions/setup-java@v4
57+
with:
58+
java-version: ${{ matrix.jdk }}
59+
distribution: 'temurin'
60+
java-package: jdk
61+
architecture: x64
6262

63-
- name: Echo Java Version
64-
run: >
65-
java -version
63+
- name: Echo Java Version
64+
run: >
65+
java -version
6666
67-
- name: Test
68-
run: >
69-
mvn clean test
70-
${{matrix.os.skip_javadoc}}
71-
${{matrix.os.skip_gpg}}
67+
- name: Test
68+
run: >
69+
mvn clean test
70+
${{matrix.os.skip_javadoc}}
71+
${{matrix.os.skip_gpg}}
7272
73-
- name: Install
74-
run: >
75-
mvn clean install -B
76-
${{matrix.os.skip_javadoc}}
77-
-D skipTests=true
78-
${{matrix.os.skip_gpg}}
73+
- name: Install
74+
run: >
75+
mvn clean install -B
76+
${{matrix.os.skip_javadoc}}
77+
-D skipTests=true
78+
${{matrix.os.skip_gpg}}
7979
8080
# Architecture options: x86, x64, armv7, aarch64, ppc64le
8181
# setup-java@v4 has a "with cache" option

.github/workflows/check_cpp_files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Serialization Compatibility Test
1+
name: CPP SerDe Compatibility Test
22

33
on:
44
push:

.github/workflows/codeql-analysis.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,45 +27,45 @@ jobs:
2727
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
2828

2929
steps:
30-
- name: Checkout repository
31-
uses: actions/checkout@v4
30+
- name: Checkout repository
31+
uses: actions/checkout@v4
3232

33-
- name: Setup Java
34-
uses: actions/setup-java@v4
35-
with:
36-
distribution: 'temurin'
37-
cache: 'maven'
38-
java-version: '17'
33+
- name: Setup Java
34+
uses: actions/setup-java@v4
35+
with:
36+
distribution: 'temurin'
37+
cache: 'maven'
38+
java-version: '17'
3939

40-
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@v3
42-
with:
43-
languages: ${{ matrix.language }}
44-
queries: +security-and-quality
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/init@v3
42+
with:
43+
languages: ${{ matrix.language }}
44+
queries: +security-and-quality
4545

4646
# If you wish to specify custom queries, you can do so here or in a config file.
4747
# By default, queries listed here will override any specified in a config file.
4848
# Prefix the list here with "+" to use these queries and those in the config file.
4949
# Details on CodeQL's query packs refer to link below.
5050

51-
- name: Custom building using maven
52-
run: >
53-
mvn clean package -f "pom.xml" -B -V -e
54-
-Dfindbugs.skip=true
55-
-Dcheckstyle.skip=true
56-
-Dpmd.skip=true
57-
-Denforcer.skip
58-
-Dmaven.javadoc.skip
59-
-DskipTests=true
60-
-Dmaven.test.skip.exec
61-
-Dlicense.skip=true
62-
-Dweb.console.skip=true
63-
-Dgpg.skip=true
51+
- name: Custom building using maven
52+
run: >
53+
mvn clean package -f "pom.xml" -B -V -e
54+
-Dfindbugs.skip=true
55+
-Dcheckstyle.skip=true
56+
-Dpmd.skip=true
57+
-Denforcer.skip
58+
-Dmaven.javadoc.skip
59+
-DskipTests=true
60+
-Dmaven.test.skip.exec
61+
-Dlicense.skip=true
62+
-Dweb.console.skip=true
63+
-Dgpg.skip=true
6464
65-
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@v3
67-
with:
68-
category: "/language:${{matrix.language}}"
65+
- name: Perform CodeQL Analysis
66+
uses: github/codeql-action/analyze@v3
67+
with:
68+
category: "/language:${{matrix.language}}"
6969

7070

7171
# CodeQL's Query Packs:

.github/workflows/javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Print Current workflow
2424
run: >
25-
cat .github/workflows/manual-javadoc.yml
25+
cat .github/workflows/javadoc.yml
2626
2727
- name: Generate JavaDoc
2828
run: mvn javadoc:javadoc
@@ -31,6 +31,6 @@ jobs:
3131
uses: JamesIves/github-pages-deploy-action@v4.6.8
3232
with:
3333
token: ${{ secrets.GITHUB_TOKEN }}
34-
folder: target/site/apidocs
34+
folder: target/reports/apidocs
3535
target-folder: docs/${{ github.ref_name }}
3636
branch: gh-pages

0 commit comments

Comments
 (0)