From efe2ec2a46ffc379faf21c2110d56c5804413586 Mon Sep 17 00:00:00 2001 From: Hubert Date: Tue, 23 Apr 2024 14:13:05 +0200 Subject: [PATCH] Fix locale-based sort (#460) * fix locale-dependent sort * update build.yml --- .github/workflows/build.yml | 28 ++++++++++++++-------------- generate_ci.sh | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e60a1a89..4fda4846 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,23 +204,23 @@ jobs: GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - d_grpc_bench: + dotnet_grpc_bench: runs-on: ubuntu-latest needs: - set-image-name - changed - if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'd_grpc_bench/') + if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'dotnet_grpc_bench/') steps: - name: Checkout uses: actions/checkout@v4 - - name: Build d_grpc_bench - run: ./build.sh d_grpc_bench + - name: Build dotnet_grpc_bench + run: ./build.sh dotnet_grpc_bench env: GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - - name: Benchmark d_grpc_bench - run: ./bench.sh d_grpc_bench + - name: Benchmark dotnet_grpc_bench + run: ./bench.sh dotnet_grpc_bench env: GRPC_BENCHMARK_DURATION: 30s GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} @@ -235,28 +235,28 @@ jobs: - if: github.ref == 'refs/heads/master' name: If on master push image to GHCR - run: docker push $GRPC_IMAGE_NAME:d_grpc_bench-complex_proto + run: docker push $GRPC_IMAGE_NAME:dotnet_grpc_bench-complex_proto env: GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - dotnet_grpc_bench: + d_grpc_bench: runs-on: ubuntu-latest needs: - set-image-name - changed - if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'dotnet_grpc_bench/') + if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'd_grpc_bench/') steps: - name: Checkout uses: actions/checkout@v4 - - name: Build dotnet_grpc_bench - run: ./build.sh dotnet_grpc_bench + - name: Build d_grpc_bench + run: ./build.sh d_grpc_bench env: GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - - name: Benchmark dotnet_grpc_bench - run: ./bench.sh dotnet_grpc_bench + - name: Benchmark d_grpc_bench + run: ./bench.sh d_grpc_bench env: GRPC_BENCHMARK_DURATION: 30s GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} @@ -271,7 +271,7 @@ jobs: - if: github.ref == 'refs/heads/master' name: If on master push image to GHCR - run: docker push $GRPC_IMAGE_NAME:dotnet_grpc_bench-complex_proto + run: docker push $GRPC_IMAGE_NAME:d_grpc_bench-complex_proto env: GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} diff --git a/generate_ci.sh b/generate_ci.sh index 0d35b5ca..f130aa5f 100755 --- a/generate_ci.sh +++ b/generate_ci.sh @@ -110,4 +110,4 @@ while read -r bench; do EOF -done < <(find . -maxdepth 1 -type d -name '*_bench' | sort) +done < <(find . -maxdepth 1 -type d -name '*_bench' | sort --version-sort)