Skip to content

Commit 8be2bdf

Browse files
authored
Merge branch 'master' into patch-1
2 parents 9ecaa30 + 87e8fa7 commit 8be2bdf

File tree

1,672 files changed

+24096
-26237
lines changed

Some content is hidden

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

1,672 files changed

+24096
-26237
lines changed

.github/actions/build/action.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: 'Builder'
2+
description: 'build project'
3+
inputs:
4+
path:
5+
description: 'project root path'
6+
required: true
7+
job-name:
8+
description: 'Job name'
9+
required: true
10+
build-commands:
11+
description: 'Build Commands'
12+
required: true
13+
outputs:
14+
logs:
15+
description: "logs"
16+
value: ${{ steps.build.outputs.logs }}
17+
path:
18+
description: "output path"
19+
value: ${{ steps.build.outputs.path }}
20+
runs:
21+
using: "composite"
22+
steps:
23+
- id: build
24+
name: build
25+
run: |
26+
buildlogfile=${{ inputs.job-name }}-build.log
27+
echo "::set-output name=path::$(echo generated/${{ inputs.job-name }})"
28+
curdir=$(pwd)
29+
echo -e "\n****** BUILD ******\n" >> $curdir/$buildlogfile
30+
cd ${{ inputs.path }}
31+
echo -e "${{ inputs.build-commands }}" > $curdir/buildcommands.log
32+
echo "::set-output name=logs::$(echo $curdir/$buildlogfile)"
33+
buildcommands=$(cat $curdir/buildcommands.log)
34+
35+
while [ "$buildcommands" ] ;do
36+
iter=${buildcommands%%__&&__*}
37+
echo -e "\n****** executing: $iter ******\n"
38+
echo -e "\n****** executing: $iter ******\n" >> $curdir/$buildlogfile
39+
$iter 2>&1 | tee --append $curdir/$buildlogfile
40+
[ "$buildcommands" = "$iter" ] && \
41+
buildcommands='' || \
42+
buildcommands="${buildcommands#*__&&__}"
43+
done
44+
cd ${curdir}
45+
echo "::set-output name=logs::$(echo $curdir/$buildlogfile)"
46+
shell: bash

.github/actions/dotnetbuild/action.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/actions/generate/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ runs:
2929
name: generate
3030
run: |
3131
logfile=${{ inputs.job-name }}.log
32-
echo "::set-output name=logs::$(echo $logfile)"
3332
chmod +x ${{ github.action_path }}/generate.sh
33+
echo "${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }}"
3434
echo -e "\n****** generate ******\n" > $logfile
35-
${{ github.action_path }}/generate.sh ${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }} >> $logfile
35+
echo "::set-output name=logs::$(echo $logfile)"
36+
${{ github.action_path }}/generate.sh ${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }} 2>&1 | tee --append $logfile
3637
echo "::set-output name=path::$(echo generated/${{ inputs.job-name }})"
38+
echo "::set-output name=logs::$(echo $logfile)"
3739
shell: bash

.github/actions/generate/generate.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
SCRIPT="$0"
44

@@ -17,18 +17,28 @@ executable="swagger-codegen-cli.jar"
1717

1818
LANG=$1
1919

20+
echo "LANGUAGE $LANG"
21+
2022
JOB_NAME=$2
23+
24+
echo "JOB_NAME $JOB_NAME"
25+
2126
if [ -z "$JOB_NAME" ]
2227
then
2328
JOB_NAME=$LANG
2429
fi
2530

2631
SPEC_URL=$3
32+
33+
echo "SPEC_URL PARAM $SPEC_URL"
34+
2735
if [[ $SPEC_URL == "null" ]];
2836
then
2937
SPEC_URL="https://petstore3.swagger.io/api/v3/openapi.json"
3038
fi
3139

40+
echo "SPEC_URL $SPEC_URL"
41+
3242
shift;
3343
shift;
3444
shift;

.github/actions/generate/logback.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
66
</encoder>
77
</appender>
8-
<logger name="io.swagger" level="info"/>
9-
<root level="error">
8+
<logger name="io.swagger" level="debug"/>
9+
<root level="debug">
1010
<appender-ref ref="STDOUT"/>
1111
</root>
1212
</configuration>

.github/actions/javabuild/action.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/actions/jsbuild/action.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/actions/pythonbuild/action.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)