Skip to content

Commit 60cc187

Browse files
HugoMarioHugoMario
authored
Merge branch 'master' into okhttp4
2 parents c9c918a + 09ea173 commit 60cc187

File tree

232 files changed

+539
-460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+539
-460
lines changed

‎.github/actions/build/action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ runs:
2424
name: build
2525
run: |
2626
buildlogfile=${{ inputs.job-name }}-build.log
27-
echo "::set-output name=path::$(echo generated/${{ inputs.job-name }})"
27+
echo "path=$(echo generated/${{ inputs.job-name }})" >> $GITHUB_OUTPUT
2828
curdir=$(pwd)
2929
echo -e "\n****** BUILD ******\n" >> $curdir/$buildlogfile
3030
cd ${{ inputs.path }}
3131
echo -e "${{ inputs.build-commands }}" > $curdir/buildcommands.log
32-
echo "::set-output name=logs::$(echo $curdir/$buildlogfile)"
32+
echo "logs=$(echo $curdir/$buildlogfile)" >> $GITHUB_OUTPUT
3333
buildcommands=$(cat $curdir/buildcommands.log)
3434
3535
while [ "$buildcommands" ] ;do
@@ -41,6 +41,8 @@ runs:
4141
buildcommands='' || \
4242
buildcommands="${buildcommands#*__&&__}"
4343
done
44+
echo -e "\n****** executed all buildcommands ******\n"
45+
echo -e "\n****** executed all buildcommand ******\n" >> $curdir/$buildlogfile
4446
cd ${curdir}
45-
echo "::set-output name=logs::$(echo $curdir/$buildlogfile)"
47+
echo "logs=$(echo $curdir/$buildlogfile)" >> $GITHUB_OUTPUT
4648
shell: bash

‎.github/actions/generate/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ runs:
3232
chmod +x ${{ github.action_path }}/generate.sh
3333
echo "${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }}"
3434
echo -e "\n****** generate ******\n" > $logfile
35-
echo "::set-output name=logs::$(echo $logfile)"
35+
echo "logs=$(echo $logfile)" >> $GITHUB_OUTPUT
3636
${{ github.action_path }}/generate.sh ${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }} 2>&1 | tee --append $logfile
37-
echo "::set-output name=path::$(echo generated/${{ inputs.job-name }})"
38-
echo "::set-output name=logs::$(echo $logfile)"
37+
echo "path=$(echo generated/${{ inputs.job-name }})" >> $GITHUB_OUTPUT
38+
echo "logs=$(echo $logfile)" >> $GITHUB_OUTPUT
3939
shell: bash

‎.github/workflows/docker-release-3.0.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Build And Push Docker Release 3.0
2+
3+
on:
4+
workflow_dispatch:
5+
branches: [ "3.0.0" ]
6+
inputs:
7+
tag:
8+
description: tag/version to release
9+
required: true
10+
jobs:
11+
build_push_docker_release_30:
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v3
17+
name: git checkout 3.0.0
18+
with:
19+
ref: 3.0.0
20+
- name: Set up Java
21+
uses: actions/setup-java@v3
22+
with:
23+
java-version: 17
24+
distribution: temurin
25+
cache: maven
26+
- name: preliminary checks
27+
run: |
28+
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
29+
set -e
30+
# fail if templates/generators contain carriage return '\r'
31+
/bin/bash ./bin/utils/detect_carriage_return.sh
32+
# fail if generators contain merge conflicts
33+
/bin/bash ./bin/utils/detect_merge_conflict.sh
34+
# fail if generators contain tab '\t'
35+
/bin/bash ./bin/utils/detect_tab_in_java_class.sh
36+
- uses: s4u/[email protected]
37+
name: setup maven settings.xml
38+
with:
39+
servers: |
40+
[{
41+
"id": "sonatype-nexus-staging",
42+
"username": "${{ secrets.OSSRH_USERNAME }}",
43+
"password": "${{ secrets.OSSRH_TOKEN }}"
44+
},
45+
{
46+
"id": "sonatype-nexus-snapshots",
47+
"username": "${{ secrets.OSSRH_USERNAME }}",
48+
"password": "${{ secrets.OSSRH_TOKEN }}"
49+
}]
50+
- name: Build with Maven
51+
run: |
52+
# mvn clean install -U -Pdocker -Plinux -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089
53+
- name: docker build and push
54+
run: |
55+
export DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator-v3-minimal
56+
export DOCKER_GENERATOR_FULL_IMAGE_NAME=swaggerapi/swagger-generator-v3
57+
export DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME=swaggerapi/swagger-generator-v3-root
58+
export DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli-v3
59+
mvn -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089 clean install -Pdocker -Prelease --settings $HOME/.m2/settings.xml
60+
docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }} -f ./modules/swagger-generator/Dockerfile_minimal ./modules/swagger-generator
61+
docker tag $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }} $DOCKER_GENERATOR_IMAGE_NAME:latest
62+
docker push $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }}
63+
docker push $DOCKER_GENERATOR_IMAGE_NAME:latest
64+
docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }} ./modules/swagger-codegen-cli
65+
docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }} $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest
66+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }}
67+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest
68+
docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:${{ env.TAG }}
69+
docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:latest
70+
docker push $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:${{ env.TAG }}
71+
docker push $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:latest
72+
docker tag $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:${{ env.TAG }} $DOCKER_GENERATOR_FULL_IMAGE_NAME:${{ env.TAG }}-root
73+
docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:$${{ env.TAG }}-root
74+
env:
75+
TAG: ${{ github.event.inputs.tag }}

‎.github/workflows/test-framework-ada.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -174,7 +174,7 @@ jobs:
174174
build-commands: ${{ env.BUILD_COMMANDS }}
175175
- id: outcome
176176
run: |
177-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
177+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
178178
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
179179
- name: upload build outcome
180180
uses: actions/upload-artifact@v2

‎.github/workflows/test-framework-clojure.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -180,7 +180,7 @@ jobs:
180180
build-commands: ${{ env.BUILD_COMMANDS }}
181181
- id: outcome
182182
run: |
183-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
183+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
184184
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
185185
- name: upload build outcome
186186
uses: actions/upload-artifact@v2

‎.github/workflows/test-framework-dart.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -162,7 +162,7 @@ jobs:
162162
build-commands: ${{ env.BUILD_COMMANDS }}
163163
- id: outcome
164164
run: |
165-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
165+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
166166
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
167167
- name: upload build outcome
168168
uses: actions/upload-artifact@v2

‎.github/workflows/test-framework-dotnet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -174,7 +174,7 @@ jobs:
174174
build-commands: ${{ env.BUILD_COMMANDS }}
175175
- id: outcome
176176
run: |
177-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
177+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
178178
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
179179
- name: upload build outcome
180180
uses: actions/upload-artifact@v2

‎.github/workflows/test-framework-elixir.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -165,7 +165,7 @@ jobs:
165165
build-commands: ${{ env.BUILD_COMMANDS }}
166166
- id: outcome
167167
run: |
168-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
168+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
169169
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
170170
- name: upload build outcome
171171
uses: actions/upload-artifact@v2

‎.github/workflows/test-framework-go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -164,7 +164,7 @@ jobs:
164164
build-commands: ${{ env.BUILD_COMMANDS }}
165165
- id: outcome
166166
run: |
167-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
167+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
168168
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
169169
- name: upload build outcome
170170
uses: actions/upload-artifact@v2

‎.github/workflows/test-framework-java.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
options: ${{ env.OPTIONS }}
102102
- id: outcome
103103
run: |
104-
echo "::set-output name=generate_outcome::${{ steps.generate.outcome }}"
104+
echo "generate_outcome=${{ steps.generate.outcome }}" >> $GITHUB_OUTPUT
105105
echo ${{ steps.generate.outcome }} > generate_outcome_${{ env.JOB_NAME }}
106106
- name: upload generate outcome
107107
uses: actions/upload-artifact@v2
@@ -174,7 +174,7 @@ jobs:
174174
build-commands: ${{ env.BUILD_COMMANDS }}
175175
- id: outcome
176176
run: |
177-
echo "::set-output name=build_outcome::${{ steps.build.outcome }}"
177+
echo "build_outcome=${{ steps.build.outcome }}" >> $GITHUB_OUTPUT
178178
echo ${{ steps.build.outcome }} > ${{ env.JOB_NAME }}build_outcome
179179
- name: upload build outcome
180180
uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)