From 221e52a169b9f2fed2750ec85bc6c4ec47695b3f Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 7 Sep 2023 14:04:10 -0700 Subject: [PATCH 1/4] Fix broken CI --- .github/workflows/build.yml | 4 ++-- .github/workflows/docs.yaml | 2 +- .github/workflows/test.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 199487d2..8946c1d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: path: . - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v1.3.0 with: version: "3.x" repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -135,7 +135,7 @@ jobs: path: . - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v1.3.0 with: version: "3.x" repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index d538381d..b29546e8 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -38,7 +38,7 @@ jobs: python-version: "3.10" - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v1.3.0 with: version: '3.x' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 079fb448..0fcc3fe1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -53,7 +53,7 @@ jobs: override: true - name: Install Protoc - uses: arduino/setup-protoc@v2 + uses: arduino/setup-protoc@v1.3.0 with: version: '3.x' repo-token: ${{ secrets.GITHUB_TOKEN }} From e9caa9167a746ed8a860d1788e0b6d377accc50f Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 7 Sep 2023 14:09:15 -0700 Subject: [PATCH 2/4] Fix wrong description --- src/functions.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions.rs b/src/functions.rs index 6037ce19..d9a7d604 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -247,7 +247,7 @@ scalar_function!( scalar_function!( nanvl, Nanvl, - "Computes the MD5 hash of the argument, with the result written in hexadecimal." + "Returns x if x is not NaN otherwise returns y." ); scalar_function!(octet_length, OctetLength, "Returns number of bytes in the string. Since this version of the function accepts type character directly, it will not strip trailing spaces."); scalar_function!(pi, Pi); From 7361a931306acc4ef5e2eae8a65c2b408bf4866b Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 7 Sep 2023 14:17:01 -0700 Subject: [PATCH 3/4] Revert "Fix wrong description" This reverts commit e9caa9167a746ed8a860d1788e0b6d377accc50f. --- src/functions.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions.rs b/src/functions.rs index d9a7d604..6037ce19 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -247,7 +247,7 @@ scalar_function!( scalar_function!( nanvl, Nanvl, - "Returns x if x is not NaN otherwise returns y." + "Computes the MD5 hash of the argument, with the result written in hexadecimal." ); scalar_function!(octet_length, OctetLength, "Returns number of bytes in the string. Since this version of the function accepts type character directly, it will not strip trailing spaces."); scalar_function!(pi, Pi); From fa4cd6e9128ffc455e654c153d014c0c40db1048 Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 7 Sep 2023 14:26:38 -0700 Subject: [PATCH 4/4] Fix --- .github/workflows/build.yml | 6 ++++-- .github/workflows/test.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8946c1d9..53c7032b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,12 @@ name: Python Release Build on: pull_request: - branches: ["main"] + branches: + - main push: tags: ["*-rc*"] - branches: ["branch-*"] + branches: + - branch-* jobs: generate-license: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0fcc3fe1..4a7c0e09 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -18,9 +18,11 @@ name: Python test on: push: - branches: [main] + branches: + - main pull_request: - branches: [main] + branches: + - main concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}