From 7b545e097b3e66ba51a59db1781d68147a35c651 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 6 Jan 2025 11:40:28 +0100 Subject: [PATCH] ci: ci cleanup (#23192) (cherry picked from commit 787a713a935fd217b97c53b98cc0f95173eb758e) # Conflicts: # .github/workflows/build.yml --- .github/scripts/get-rocksdb-version.sh | 12 ----- .github/scripts/install-rocksdb-deps.sh | 4 -- .github/scripts/install-rocksdb.sh | 17 ------- .github/workflows/build.yml | 11 +++++ .github/workflows/cache-rocksdb.yml | 62 ------------------------- .github/workflows/lint.yml | 19 -------- .github/workflows/test.yml | 38 +-------------- 7 files changed, 13 insertions(+), 150 deletions(-) delete mode 100755 .github/scripts/get-rocksdb-version.sh delete mode 100755 .github/scripts/install-rocksdb-deps.sh delete mode 100755 .github/scripts/install-rocksdb.sh delete mode 100644 .github/workflows/cache-rocksdb.yml diff --git a/.github/scripts/get-rocksdb-version.sh b/.github/scripts/get-rocksdb-version.sh deleted file mode 100755 index 7f72b969113..00000000000 --- a/.github/scripts/get-rocksdb-version.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -# Search for rocksdb_version in makefile -rocksdb_version=$(grep "rocksdb_version" ./scripts/build/build.mk | cut -d'=' -f2) - -if [[ -z "${rocksdb_version}" ]]; then - echo "Error: rocksdb_version not found in ./scripts/build/build.mk" >&2 - exit 1 -else - echo "ROCKSDB_VERSION=${rocksdb_version}" >> "${GITHUB_ENV}" -fi \ No newline at end of file diff --git a/.github/scripts/install-rocksdb-deps.sh b/.github/scripts/install-rocksdb-deps.sh deleted file mode 100755 index 724f7bff2e7..00000000000 --- a/.github/scripts/install-rocksdb-deps.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -sudo apt update && sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev build-essential diff --git a/.github/scripts/install-rocksdb.sh b/.github/scripts/install-rocksdb.sh deleted file mode 100755 index b3174f39ac5..00000000000 --- a/.github/scripts/install-rocksdb.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -if [ -z "$ROCKSDB_VERSION" ]; then - echo "ROCKSDB_VERSION is not set." - exit 1 -fi - -# Clone RocksDB repository -git clone https://github.com/facebook/rocksdb.git /home/runner/rocksdb -cd /home/runner/rocksdb || exit 1 -git checkout "${ROCKSDB_VERSION}" - -# Build shared library -sudo make -j "$(nproc --all)" shared_lib -sudo cp --preserve=links ./librocksdb.* /usr/local/lib/ -sudo cp -r ./include/rocksdb/ /usr/local/include/ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aafbcbaee4e..b8b927c68f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,7 @@ jobs: with: go-version: "1.23" check-latest: true +<<<<<<< HEAD - name: Get rocksdb version run: ./.github/scripts/get-rocksdb-version.sh - name: Fix permissions for cache @@ -55,6 +56,16 @@ jobs: - name: Build with rocksdb backend if: matrix.go-arch == 'amd64' run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="rocksdb" make build +======= + - name: install aarch64-gcc + if: matrix.go-arch == 'arm64' + run: sudo apt-get install gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu + ################### + #### Build App #### + ################### + - name: Build with sqlite backend + run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,sqlite make build +>>>>>>> 787a713a9 (ci: ci cleanup (#23192)) - name: Build with BLS12381 if: matrix.go-arch == 'amd64' run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="bls12381" make build diff --git a/.github/workflows/cache-rocksdb.yml b/.github/workflows/cache-rocksdb.yml deleted file mode 100644 index 5db3dff15d2..00000000000 --- a/.github/workflows/cache-rocksdb.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Cache rocksdb libraries -on: - push: - paths: - - build.mk - schedule: - - cron: "15 */2 * * *" # Every two hours at xx:15 minutes - workflow_dispatch: - -permissions: - contents: read - -jobs: - - check-cache-rocksdb: - name: Check existing cache - runs-on: ubuntu-latest - outputs: - cache-hit: ${{ steps.cache-rocksdb.outputs.cache-hit }} - - steps: - - uses: actions/checkout@v4 - - - name: Get rocksdb version - run: ./.github/scripts/get-rocksdb-version.sh - - - name: Fix permissions for cache - run: sudo chown $(whoami) /usr/local/lib /usr/local/include - - - name: Restore rocksdb libraries cache - id: cache-rocksdb - uses: actions/cache/restore@v4 - with: - path: | - /usr/local/lib/librocksdb.* - /usr/local/include/rocksdb - key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64 - - - save-cache-rocksdb: - name: Build rocksdb libraries and save cache - runs-on: ubuntu-latest - needs: check-cache-rocksdb - if: needs.check-cache-rocksdb.outputs.cache-hit != 'true' - steps: - - uses: actions/checkout@v4 - - - name: Get rocksdb version - run: ./.github/scripts/get-rocksdb-version.sh - - - name: Install rocksdb deps - run: ./.github/scripts/install-rocksdb-deps.sh - - name: Install rocksdb - run: ./.github/scripts/install-rocksdb.sh - - - name: Saves rocksdb libraries cache - uses: actions/cache/save@v4 - with: - path: | - /usr/local/lib/librocksdb.* - /usr/local/include/rocksdb - key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3d51780871e..f88112a1495 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,30 +27,11 @@ jobs: Makefile **/Makefile .golangci.yml - - name: Get rocksdb version - run: ./.github/scripts/get-rocksdb-version.sh - - name: Fix permissions for cache - run: sudo chown $(whoami) /usr/local/lib /usr/local/include - - name: Restore rocksdb libraries cache - id: cache-rocksdb - uses: actions/cache/restore@v4 - with: - path: | - /usr/local/lib/librocksdb.* - /usr/local/include/rocksdb - key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64 - - name: Install rocksdb deps - run: ./.github/scripts/install-rocksdb-deps.sh - - name: Install rocksdb - if: steps.cache-rocksdb.outputs.cache-hit != 'true' - run: ./.github/scripts/install-rocksdb.sh - name: run linting (long) if: env.GIT_DIFF id: lint_long run: | make lint - env: - ROCKSDB: 1 - uses: technote-space/get-diff-action@v6.1.2 if: steps.lint_long.outcome == 'skipped' with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a652985002..43a5dbadf9a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -745,28 +745,11 @@ jobs: store/**/*.go store/go.mod store/go.sum - - name: Get rocksdb version - run: ./.github/scripts/get-rocksdb-version.sh - - name: Fix permissions for cache - run: sudo chown $(whoami) /usr/local/lib /usr/local/include - - name: Restore rocksdb libraries cache - id: cache-rocksdb - uses: actions/cache/restore@v4 - with: - path: | - /usr/local/lib/librocksdb.* - /usr/local/include/rocksdb - key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64 - - name: Install rocksdb deps - run: ./.github/scripts/install-rocksdb-deps.sh - - name: Install rocksdb - if: steps.cache-rocksdb.outputs.cache-hit != 'true' - run: ./.github/scripts/install-rocksdb.sh - name: tests if: env.GIT_DIFF run: | cd store - go test -ldflags "-r /usr/local/lib" -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./... + go test -ldflags "-r /usr/local/lib" -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./... - name: sonarcloud if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }} uses: SonarSource/sonarcloud-github-action@master @@ -795,28 +778,11 @@ jobs: store/v2/**/*.go store/v2/go.mod store/v2/go.sum - - name: Get rocksdb version - run: ./.github/scripts/get-rocksdb-version.sh - - name: Fix permissions for cache - run: sudo chown $(whoami) /usr/local/lib /usr/local/include - - name: Restore rocksdb libraries cache - id: cache-rocksdb - uses: actions/cache/restore@v4 - with: - path: | - /usr/local/lib/librocksdb.* - /usr/local/include/rocksdb - key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64 - - name: Install rocksdb deps - run: ./.github/scripts/install-rocksdb-deps.sh - - name: Install rocksdb - if: steps.cache-rocksdb.outputs.cache-hit != 'true' - run: ./.github/scripts/install-rocksdb.sh - name: test & coverage report creation if: env.GIT_DIFF run: | cd store/v2 - go test -ldflags "-r /usr/local/lib" -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./... + go test -ldflags "-r /usr/local/lib" -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./... - name: sonarcloud if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }} uses: SonarSource/sonarcloud-github-action@master