From 68a3b76aeae879e51d9c3e11b301f08e82d90b8d Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Tue, 13 Feb 2024 20:27:06 +0000 Subject: [PATCH 1/8] #1807 Update test.yml --- .github/workflows/test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ec07ee36..6ac192d94 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,12 +42,13 @@ jobs: key: ${{ runner.os }}-apt-cache ttl: 1000000 # purge cache every 1000000 seconds (10 days). This is to pull updated packages - name: update apt - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test || true + sudo apt-get update || true - name: install packages run: | sudo apt-get -y remove libzmq* || true - sudo apt-get -y install software-properties-common - sudo apt-get -y install gcc-9 g++-9 + sudo apt-get -y install software-properties-common gcc-9 g++-9 || true - name: Use g++-9 and gcov-9 by default run: | From ed3a3850a00957189153ec89fcf37dadd2fba94a Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Tue, 13 Feb 2024 20:53:09 +0000 Subject: [PATCH 2/8] #1807 Update publish.yml --- .github/workflows/publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d29c19089..7a73c85ef 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,12 +21,13 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} steps: - name: update apt - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test || true + sudo apt-get update || true - name: install packages run: | sudo apt-get -y remove libzmq* || true - sudo apt-get -y install software-properties-common - sudo apt-get -y install gcc-9 g++-9 + sudo apt-get -y install software-properties-common gcc-9 g++-9 || true - name: Use g++-9 and gcov-9 by default run: | From a411894db76049a72efec8b3ae59f2e8a19e11d9 Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Tue, 13 Feb 2024 20:57:11 +0000 Subject: [PATCH 3/8] Update test.yml --- .github/workflows/test.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ac192d94..be9ed71b8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,14 +9,6 @@ defaults: run: shell: bash jobs: - cancel-runs: - name: Cancel Previous Runs - runs-on: ubuntu-latest - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} build: runs-on: self-hosted env: @@ -27,6 +19,10 @@ jobs: ccache_compress: 'true' ccache_compresslevel: 9 steps: + - name: Cancel Previous Runs + uses: styfle/cancel-workflow-action@0.9.1 + with: + access_token: ${{ github.token }} - name: Extract repo name run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}') shell: bash From dce16a4b022c38ee6bc19268af4a02ac940a922b Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Tue, 13 Feb 2024 21:04:24 +0000 Subject: [PATCH 4/8] #1807 Update test.yml --- .github/workflows/test.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be9ed71b8..f9d9b8255 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -266,21 +266,6 @@ jobs: ls /tmp/tests/HashSnapshotTestSuitePassed || sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t HashSnapshotTestSuite -- --all --verbosity 4 ls /tmp/tests/ClientSnapshotsSuitePassed || sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t ClientSnapshotsSuite -- --all --verbosity 4 cd .. - - - name: Create lcov report - run: | - lcov --capture --directory . --output-file coverage.info - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files - lcov --remove coverage.info 'deps/*' --output-file coverage.info # filter dependency files - lcov --remove coverage.info 'libconsensus/deps/*' --output-file coverage.info # filter dependency files - lcov --remove coverage.info 'libconsensus/libBLS/deps/*' --output-file coverage.info # filter dependency files - lcov --remove coverage.info '.hunter/*' --output-file coverage.info # filter dependency files - - - name: Upload to Codecov - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./coverage.info - name: Configure all as historic run: | From 280f32bb30c176f7e5b70ea2bdb322afdef802ae Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Tue, 13 Feb 2024 21:23:23 +0000 Subject: [PATCH 5/8] #1807 Create PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..06224d26e --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,11 @@ +## Description + +_Please provide a brief summary of your changes here. Replace this comment with your summary._ + +## Tests + +_Describe how you tested the changes made in this pull request. Include specific tests you have added. Replace this comment with your testing methodology._ + +## Performance Impact + +_Describe any potential impact on performance due to your changes. Include any benchmarks you performed, if applicable, and compare the results with and without your changes. Replace this comment with your performance analysis._ From a3220ceb3b85912d9c89ad7aca056f1fdea8c59e Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Wed, 14 Feb 2024 15:54:38 +0000 Subject: [PATCH 6/8] #1807 Remove extra steps in custom_build --- .github/workflows/custom_build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/custom_build.yml b/.github/workflows/custom_build.yml index bac69d511..614f88996 100644 --- a/.github/workflows/custom_build.yml +++ b/.github/workflows/custom_build.yml @@ -38,8 +38,7 @@ jobs: - name: install packages run: | sudo apt-get -y remove libzmq* || true - sudo apt-get -y install software-properties-common - sudo apt-get -y install gcc-9 g++-9 + sudo apt-get -y install software-properties-common gcc-9 g++-9 || true - name: Use g++-9 and gcov-9 by default run: | @@ -83,8 +82,6 @@ jobs: rm -rf ./libconsensus || true ls -1 git submodule update --init --recursive - - name: update apt - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; - name: Prepare ccache timestamp id: ccache_cache_timestamp From d0aeedb3aa81854b0bbbf2a97a1883c9d33d19ba Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Wed, 14 Feb 2024 18:41:35 +0000 Subject: [PATCH 7/8] #1807 Update custom_build.yml --- .github/workflows/custom_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/custom_build.yml b/.github/workflows/custom_build.yml index 614f88996..79c039b04 100644 --- a/.github/workflows/custom_build.yml +++ b/.github/workflows/custom_build.yml @@ -34,7 +34,9 @@ jobs: BUILD_TYPE: ${{ github.event.inputs.build_type }} steps: - name: update apt - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test || true + sudo apt-get update || true - name: install packages run: | sudo apt-get -y remove libzmq* || true From 8a6df97923a720f8df05242aaf25dfa0cc356ab9 Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Thu, 15 Feb 2024 19:16:25 +0000 Subject: [PATCH 8/8] Update functional-tests.yml --- .github/workflows/functional-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml index 52a420c3d..02ad6deb7 100644 --- a/.github/workflows/functional-tests.yml +++ b/.github/workflows/functional-tests.yml @@ -29,7 +29,7 @@ - name: Set up Node uses: actions/setup-node@v3.4.0 with: - node-version: 16 + node-version: 18 - name: Install packages run: | sudo apt-get update