From 192ed95f8f53791f2c0fb7ff53c2460f5a70eff7 Mon Sep 17 00:00:00 2001 From: Denis Averin <59285247+Denis-Averin@users.noreply.github.com> Date: Mon, 4 Sep 2023 23:54:42 +0700 Subject: [PATCH] Release 23.8 (#80) * Fix bash scripts * Update submodules * Check all submodules up-to-date --- .github/workflows/check-codegen.yml | 4 +++- codegen/generate-android.bash | 2 +- codegen/generate-dart.bash | 6 +++--- codegen/generate-dotnet.bash | 4 ++-- codegen/generate-php.bash | 2 +- scripts/switch_all_submodules_to_main.bash | 2 +- submodules/android | 2 +- submodules/dart | 2 +- submodules/dotnet | 2 +- submodules/go | 2 +- submodules/java | 2 +- submodules/node | 2 +- submodules/php | 2 +- submodules/python | 2 +- 14 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/check-codegen.yml b/.github/workflows/check-codegen.yml index b953f8a..aaa6504 100644 --- a/.github/workflows/check-codegen.yml +++ b/.github/workflows/check-codegen.yml @@ -18,7 +18,9 @@ jobs: submodules: recursive - name: Check all submodules up-to-date - run: git diff --exit-code + run: | + git submodule update --recursive --remote + git diff --exit-code check-master: runs-on: ubuntu-latest diff --git a/codegen/generate-android.bash b/codegen/generate-android.bash index aa67c78..7aff467 100755 --- a/codegen/generate-android.bash +++ b/codegen/generate-android.bash @@ -10,7 +10,7 @@ then rm -rf $tempDir fi -# java -jar Tools/swagger-codegen-cli.jar config-help -l android & exit 1 +# java -jar Tools/swagger-codegen-cli.jar config-help -l android ; exit 1 java -jar Tools/swagger-codegen-cli.jar generate -i "${specSource}" -l android -t Templates/android -o $tempDir -c config-android.json # java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l android -t Templates/java -o $tempDir -c config-android.json > debugModels.android.json # java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l android -t Templates/java -o $tempDir -c config-android.json > debugOperations.android.json diff --git a/codegen/generate-dart.bash b/codegen/generate-dart.bash index a3781d9..c7b3781 100755 --- a/codegen/generate-dart.bash +++ b/codegen/generate-dart.bash @@ -10,9 +10,9 @@ then rm -rf $tempDir fi -# java -jar Tools/swagger-codegen-cli.jar config-help -l dart & exit -# java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l dart -t Templates/dart -o $tempDir -c config-dart.json > debugModels.dart.json & exit -# java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l dart -t Templates/dart -o $tempDir -c config-dart.json > debugOperations.dart.json & exit +# java -jar Tools/swagger-codegen-cli.jar config-help -l dart ; exit +# java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l dart -t Templates/dart -o $tempDir -c config-dart.json > debugModels.dart.json ; exit +# java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l dart -t Templates/dart -o $tempDir -c config-dart.json > debugOperations.dart.json ; exit java -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l dart -t Templates/dart -o $tempDir -c config-dart.json diff --git a/codegen/generate-dotnet.bash b/codegen/generate-dotnet.bash index e452b06..16d28d1 100755 --- a/codegen/generate-dotnet.bash +++ b/codegen/generate-dotnet.bash @@ -12,8 +12,8 @@ then fi # Generate Operations and Models for Debug purposes -# java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l csharp -t Templates/csharp -o $tempDir -c config.json > debugOperations.cs.json & exit -# java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l csharp -t Templates/csharp -o $tempDir -c config.json > debugModels.cs.json & exit +# java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l csharp -t Templates/csharp -o $tempDir -c config.json > debugOperations.cs.json ; exit +# java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l csharp -t Templates/csharp -o $tempDir -c config.json > debugModels.cs.json ; exit java -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l csharp -t Templates/csharp -o $tempDir -c config.json python Tools/split-cs-file.py $tempDir/src/Aspose.BarCode.Cloud.Sdk/Api/BarcodeApi.cs $tempDir/src/Aspose.BarCode.Cloud.Sdk/Model/Requests/ diff --git a/codegen/generate-php.bash b/codegen/generate-php.bash index 1e53167..f953c9a 100755 --- a/codegen/generate-php.bash +++ b/codegen/generate-php.bash @@ -10,7 +10,7 @@ then rm -rf "${tempDir}" fi -# java -jar Tools/swagger-codegen-cli.jar config-help -l php & exit 1 +# java -jar Tools/swagger-codegen-cli.jar config-help -l php ; exit 1 # java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "${specSource}" -l php -t Templates/php -o "${tempDir}" -c config-php.json > debugModels.php.json # java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "${specSource}" -l php -t Templates/php -o "${tempDir}" -c config-php.json > debugOperations.php.json java -jar Tools/swagger-codegen-cli.jar generate -i "${specSource}" -l php -t Templates/php -o "${tempDir}" -c config-php.json diff --git a/scripts/switch_all_submodules_to_main.bash b/scripts/switch_all_submodules_to_main.bash index 40a2b29..ebeea87 100755 --- a/scripts/switch_all_submodules_to_main.bash +++ b/scripts/switch_all_submodules_to_main.bash @@ -7,7 +7,7 @@ pushd "$(dirname "$0")/../submodules" for d in */ ; do pushd "$d" - git fetch && git switch main && git pull --ff-only + (git fetch --prune && git switch main && git pull --ff-only) || true popd >/dev/null done diff --git a/submodules/android b/submodules/android index 864d4ad..4a0e83a 160000 --- a/submodules/android +++ b/submodules/android @@ -1 +1 @@ -Subproject commit 864d4adddd09a230fc2d5d5531b4dfebe2f9827d +Subproject commit 4a0e83afbf73e30363492fd5e60fa0f7ab7271d9 diff --git a/submodules/dart b/submodules/dart index b664506..0b1880e 160000 --- a/submodules/dart +++ b/submodules/dart @@ -1 +1 @@ -Subproject commit b6645060878b2d00353ccf577c9ec08cff14e322 +Subproject commit 0b1880e71f0c40fe9a5013ceb41825314c42379d diff --git a/submodules/dotnet b/submodules/dotnet index f47b566..e69d0bc 160000 --- a/submodules/dotnet +++ b/submodules/dotnet @@ -1 +1 @@ -Subproject commit f47b5666830688710316120a033a98139d8540c2 +Subproject commit e69d0bcaa0053172e395084803930e66f95f5e37 diff --git a/submodules/go b/submodules/go index 50c6884..452a23c 160000 --- a/submodules/go +++ b/submodules/go @@ -1 +1 @@ -Subproject commit 50c6884e71c2a736fa552213a4b87920294cc300 +Subproject commit 452a23ca13e6055fabb6a1d4654e6fa3426850ed diff --git a/submodules/java b/submodules/java index cbbcf5f..5decb48 160000 --- a/submodules/java +++ b/submodules/java @@ -1 +1 @@ -Subproject commit cbbcf5fc36c90552fb6875b36682d25aaebf7b73 +Subproject commit 5decb48d641a06d87603114e35afd4ae100fc580 diff --git a/submodules/node b/submodules/node index bb5f562..aa561da 160000 --- a/submodules/node +++ b/submodules/node @@ -1 +1 @@ -Subproject commit bb5f562ce2eda6c2274729626ce4ffeafe1d2681 +Subproject commit aa561daca6728d30eb17b35ff125ecaed2b49469 diff --git a/submodules/php b/submodules/php index e79ea4a..8d0276b 160000 --- a/submodules/php +++ b/submodules/php @@ -1 +1 @@ -Subproject commit e79ea4a23481830b2aec44eef37419c9254c197e +Subproject commit 8d0276b3799df26782ae48aadd9389e73ac5d68d diff --git a/submodules/python b/submodules/python index e183e2b..6a72adc 160000 --- a/submodules/python +++ b/submodules/python @@ -1 +1 @@ -Subproject commit e183e2b87768b2548047957129325f1b9811f3ca +Subproject commit 6a72adca5a61cd522293d11633ac9995217e8a7b