Skip to content

Cherrypick #2197 to release-15 #2205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
generate fluent module
Signed-off-by: yue9944882 <[email protected]>
  • Loading branch information
yue9944882 committed Apr 7, 2022
commit 1e567bb5dce25807b7ffc3a56bcf4a1585f6b462
42 changes: 33 additions & 9 deletions .github/workflows/generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ on:


jobs:
release:
generate:
runs-on: ubuntu-latest
steps:
- name: Checkout Java
uses: actions/checkout@v3
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8.0.x
- name: Checkout Gen
uses: actions/checkout@v3
with:
Expand All @@ -25,26 +30,45 @@ jobs:
run: |
SUFFIX=$(openssl rand -hex 4)
echo "BRANCH=automated-generate-$SUFFIX" >> $GITHUB_ENV
- name: Generate
- name: Get Project Version
run: |
echo "PROJECT_VERSION=$(mvn -q \
-Dexec.executable="echo" \
-Dexec.args='${project.version}' \
--non-recursive \
org.codehaus.mojo:exec-maven-plugin:1.6.0:exec)" >> $GITHUB_ENV
- name: Generate Openapi
run: |
cd gen/openapi
pushd gen/openapi
cat <<"EOF"> settings
# Kubernetes branch to get the OpenAPI spec from.
export KUBERNETES_BRANCH="${{ github.event.inputs.kubernetesBranch }}"

# client version for packaging and releasing. It can
# be different than SPEC_VERSION.
export CLIENT_VERSION=$(mvn -q \
-Dexec.executable="echo" \
-Dexec.args='${project.version}' \
--non-recursive \
org.codehaus.mojo:exec-maven-plugin:1.6.0:exec)
export CLIENT_VERSION=${{ env.PROJECT_VERSION }}

# Name of the release package
export PACKAGE_NAME="io.kubernetes.client.openapi"
EOF

bash java.sh ../../kubernetes/ settings
cd ../../
popd
rm -rf gen
- name: Generate Fluent
run: |
# Only install the generated openapi module because the higher modules' compile
# may fail due to api-changes.
mvn -Pfluent-gen -pl kubernetes -am clean install
pushd fluent-gen
bash -x generate.sh
popd
- name: Formatter
run: |
mvn spotless:apply
- name: Commit and push
run: |
# Commit and push
git config user.email "[email protected]"
git config user.name "Kubernetes Prow Robot"
git checkout -b "$BRANCH"
Expand Down
16 changes: 1 addition & 15 deletions fluent-gen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,9 @@
Start from a totally clean environment (eg. a clean VM if you can), clone everything.

## Step one
Comment out the existing fluent module from the pom.xml

```xml
...
<!--
<module>fluent</module>
<module>spring</module>
<module>e2e</module>
<module>examples</module>
-->
...
```
`mvn -Pfluent-gen install`

## Step two
`mvn install`

## Step three
```
cd fluent-gen; ./generate.sh
```
Expand Down
3 changes: 1 addition & 2 deletions fluent-gen/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
# TODO: Incorporate this into the pom.xml

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