Skip to content

Commit b6459e9

Browse files
committed
generate fluent module
Signed-off-by: yue9944882 <[email protected]>
1 parent d481e1b commit b6459e9

File tree

3 files changed

+32
-26
lines changed

3 files changed

+32
-26
lines changed

.github/workflows/generate.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ on:
1010

1111

1212
jobs:
13-
release:
13+
generate:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Java
1717
uses: actions/checkout@v3
18+
- name: Setup Java
19+
uses: actions/setup-java@v2
20+
with:
21+
distribution: 'temurin'
22+
java-version: 8.0.x
1823
- name: Checkout Gen
1924
uses: actions/checkout@v3
2025
with:
@@ -25,26 +30,42 @@ jobs:
2530
run: |
2631
SUFFIX=$(openssl rand -hex 4)
2732
echo "BRANCH=automated-generate-$SUFFIX" >> $GITHUB_ENV
28-
- name: Generate
33+
- name: Get Project Version
34+
run: |
35+
echo "PROJECT_VERSION=$(mvn -q \
36+
-Dexec.executable="echo" \
37+
-Dexec.args='${project.version}' \
38+
--non-recursive \
39+
org.codehaus.mojo:exec-maven-plugin:1.6.0:exec)" >> $GITHUB_ENV
40+
- name: Generate Openapi
2941
run: |
30-
cd gen/openapi
42+
pushd gen/openapi
3143
cat <<"EOF"> settings
3244
# Kubernetes branch to get the OpenAPI spec from.
3345
export KUBERNETES_BRANCH="${{ github.event.inputs.kubernetesBranch }}"
3446
3547
# client version for packaging and releasing. It can
3648
# be different than SPEC_VERSION.
37-
export CLIENT_VERSION=$(mvn -q \
38-
-Dexec.executable="echo" \
39-
-Dexec.args='${project.version}' \
40-
--non-recursive \
41-
org.codehaus.mojo:exec-maven-plugin:1.6.0:exec)
49+
export CLIENT_VERSION=${{ env.PROJECT_VERSION }}
4250
51+
# Name of the release package
4352
export PACKAGE_NAME="io.kubernetes.client.openapi"
4453
EOF
4554
4655
bash java.sh ../../kubernetes/ settings
47-
cd ../../
56+
popd
57+
rm -rf gen
58+
- name: Generate Fluent
59+
run: |
60+
pushd fluent-gen
61+
bash -x generate.sh
62+
popd
63+
- name: Formatter
64+
run: |
65+
mvn spotless:apply
66+
- name: Commit and push
67+
run: |
68+
# Commit and push
4869
git config user.email "[email protected]"
4970
git config user.name "Kubernetes Prow Robot"
5071
git checkout -b "$BRANCH"

fluent-gen/README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@
44
Start from a totally clean environment (eg. a clean VM if you can), clone everything.
55

66
## Step one
7-
Comment out the existing fluent module from the pom.xml
8-
9-
```xml
10-
...
11-
<!--
12-
<module>fluent</module>
13-
<module>spring</module>
14-
<module>e2e</module>
15-
<module>examples</module>
16-
-->
17-
...
18-
```
7+
`mvn -Pfluent-gen install`
198

209
## Step two
21-
`mvn install`
22-
23-
## Step three
2410
```
2511
cd fluent-gen; ./generate.sh
2612
```

fluent-gen/generate.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
# TODO: Incorporate this into the pom.xml
44

55
rm -r ../fluent/src/main/java/io
6-
mvn clean
7-
mvn compile
6+
mvn -Pfluent-gen clean compile
87
mv target/generated-sources/annotations/io ../fluent/src/main/java/io

0 commit comments

Comments
 (0)