From 19092d9310f916b963797ede2dfb04604e9a4937 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 24 May 2022 21:09:05 +0800 Subject: [PATCH 1/8] chore: enable required ci --- .asf.yaml | 6 ++++-- .github/workflows/ci.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index ff2974baa3..92a48be808 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -37,8 +37,10 @@ github: # strict means "Require branches to be up to date before merging". strict: true # contexts are the names of checks that must pass - #contexts: - # - hugegraph ci/build + contexts: + - build + - Analyze + - CodeQL # - hugegraph-ci/build required_pull_request_reviews: dismiss_stale_reviews: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6b0198195..46a9d70817 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: hugegraph ci +name: hugegraph-ci on: push: From 8daf3b2a05c0d981cb0e963e5aae5ba44bc27d1b Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 24 May 2022 22:29:37 +0800 Subject: [PATCH 2/8] Update .asf.yaml --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 92a48be808..015046e366 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -38,8 +38,8 @@ github: strict: true # contexts are the names of checks that must pass contexts: - - build - - Analyze + # - build + - Analyze (java) - CodeQL # - hugegraph-ci/build required_pull_request_reviews: From f7be971703d386718a710a177573e2b5dd49f9c8 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 24 May 2022 22:30:08 +0800 Subject: [PATCH 3/8] Update .asf.yaml --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 015046e366..a66b17ca99 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,9 +28,9 @@ github: del_branch_on_merge: true #labels: enabled_merge_buttons: - merge: true + merge: false + rebase: false squash: true - rebase: true protected_branches: master: required_status_checks: From 41924e1f5534b384271b04f89119531577579fa5 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 24 May 2022 22:32:26 +0800 Subject: [PATCH 4/8] update ci version --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/codeql-analysis.yml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46a9d70817..17236051ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Install JDK ${{ matrix.JAVA_VERSION }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.JAVA_VERSION }} distribution: 'zulu' @@ -44,7 +44,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 2 @@ -53,7 +53,7 @@ jobs: mvn clean compile -U -Dmaven.javadoc.skip=true | grep -v "Downloading\|Downloaded" - name: Install JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '8' distribution: 'zulu' @@ -63,7 +63,7 @@ jobs: $TRAVIS_DIR/install-backend.sh $BACKEND - name: Install JDK ${{ matrix.JAVA_VERSION }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.JAVA_VERSION }} distribution: 'zulu' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5bcfa103cb..6e18a5e187 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,17 +27,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Java JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '8' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -48,7 +48,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -62,4 +62,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From d171483c2b33e49fac319700fd704b64cfddb885 Mon Sep 17 00:00:00 2001 From: imbajin Date: Wed, 26 Oct 2022 17:08:19 +0800 Subject: [PATCH 5/8] Update .asf.yaml --- .asf.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index a66b17ca99..73d6c48e56 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -36,17 +36,19 @@ github: required_status_checks: # strict means "Require branches to be up to date before merging". strict: true - # contexts are the names of checks that must pass + # contexts are the names of checks that must pass (now only enable the basic check) contexts: - # - build - Analyze (java) - CodeQL - # - hugegraph-ci/build + - build (memory, 8) + - build (memory, 11) required_pull_request_reviews: dismiss_stale_reviews: true require_code_owner_reviews: false required_approving_review_count: 2 notifications: - issues: dev@hugegraph.apache.org - pullrequests: commits@hugegraph.apache.org + issues: issues@hugegraph.apache.org + discussions: issues@hugegraph.apache.org + pullrequests_status: dev@hugegraph.apache.org + #pullrequests_comment: issues@hugegraph.apache.org From 53d58229d73c7fc5b111607c22af05e3106c4e5a Mon Sep 17 00:00:00 2001 From: imbajin Date: Wed, 26 Oct 2022 17:30:08 +0800 Subject: [PATCH 6/8] Update .asf.yaml --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 73d6c48e56..6c14423a37 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -34,7 +34,7 @@ github: protected_branches: master: required_status_checks: - # strict means "Require branches to be up to date before merging". + # strict means "Require branches to be up-to-date before merging". strict: true # contexts are the names of checks that must pass (now only enable the basic check) contexts: From dd19c834feac4c234e583dbb66ab68e2c24a0ba8 Mon Sep 17 00:00:00 2001 From: imbajin Date: Wed, 26 Oct 2022 17:31:25 +0800 Subject: [PATCH 7/8] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6e18a5e187..17f41813fc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -4,10 +4,10 @@ name: "CodeQL" on: push: - branches: [ master, release-0.*, v0.* ] + branches: [ master, release-*, v*.* ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + # branches: [ master ] # enable in all PR schedule: - cron: '33 0 * * 5' From 05ccf09e2e041b6b9efe52208cb902f524a094fd Mon Sep 17 00:00:00 2001 From: imbajin Date: Wed, 26 Oct 2022 20:09:14 +0800 Subject: [PATCH 8/8] Update .asf.yaml --- .asf.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 6c14423a37..e1dde177dc 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -48,7 +48,9 @@ github: required_approving_review_count: 2 notifications: - issues: issues@hugegraph.apache.org - discussions: issues@hugegraph.apache.org pullrequests_status: dev@hugegraph.apache.org + # before use the config, we should ensure the "mail" address has set well (exist) #pullrequests_comment: issues@hugegraph.apache.org + #issues: issues@hugegraph.apache.org + #discussions: issues@hugegraph.apache.org +