From c87d363d080c1ce310e69c5f53e7965d55afaa23 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 20:56:22 +0530 Subject: [PATCH 1/7] bug: check build for arm architecture Signed-off-by: Akash Kumar --- .github/workflows/main.yml | 47 +++++++++++--------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17bfbb981..b535883ea 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - -# - name: Check commit messages -# uses: wagoid/commitlint-github-action@v4 - - name: Set up Go uses: actions/setup-go@v2 with: @@ -25,34 +21,17 @@ jobs: run: | go build -v ./... - # - name: Test - # run: | - # export PORT=6790 - # curl --silent --location "https://github.com/keploy/keploy/releases/latest/download/keploy_linux_amd64.tar.gz" | tar xz -C /tmp - # sudo mv /tmp/keploy /usr/local/bin && export KEPLOY_MODE=off && keploy & - # export PORT=6789 && export ENABLE_TEST_EXPORT=false && go test -coverpkg=./... -coverprofile=coverage.tmp.txt -covermode=atomic ./... - # cat coverage.tmp.txt | grep -v -e "http/regression/request.go" | grep -v -e "generated.go" -e "_gen.go" | grep -v -e "services.pb.go" -e "services_grpc.pb.go" > coverage.txt - # env: - # ENABLE_DEDUP: true - # ENABLE_TELEMETRY: false - - - - # - uses: codecov/codecov-action@v2 - # with: - # files: ./coverage.txt - # - name: Install goveralls - # run: go install github.com/mattn/goveralls@latest - # - name: Send coverage - # env: - # COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # run: goveralls -coverprofile=coverage.txt -service=github + build-arm: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: "1.20.0" -# # - name: Install extra dependencies -# # run: npm install -g @semantic-release/exec -# - uses: codfish/semantic-release-action@additional-packages -# with: -# additional_packages: | -# ['@semantic-release/exec'] -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build + run: | + go build -v ./... From 70cc65fea3237265aec0dc05edebcc61c2bc448f Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 21:25:46 +0530 Subject: [PATCH 2/7] bug: changed version to v4 and added arch=arm Signed-off-by: Akash Kumar --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b535883ea..161428b3f 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: "1.21" @@ -28,10 +28,10 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: "1.20.0" - + go-version: "1.21" + architecture: arm - name: Build run: | go build -v ./... From 88ef88c8449b3b14f58e0364a8014695a0ee4d5c Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 22:10:42 +0530 Subject: [PATCH 3/7] bug: add arm build for other workflows Signed-off-by: Akash Kumar --- .github/workflows/go.yml | 79 +++++++++----------------------- .github/workflows/sample-run.yml | 40 ++++++---------- 2 files changed, 35 insertions(+), 84 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 731199636..dd03fd2b8 100755 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,12 +1,8 @@ name: Go on: -# push: -# branches: [ main ] pull_request: branches: [ main ] -# pull_request_target: -# types: [assigned, opened, synchronize, reopened] jobs: @@ -16,10 +12,6 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - -# - name: Check commit messages -# uses: wagoid/commitlint-github-action@v4 - - name: Set up Go uses: actions/setup-go@v2 with: @@ -27,56 +19,6 @@ jobs: - name: Build run: go build -v ./... - - # - name: Test-Export - # run: | - # go test -coverpkg=./... -coverprofile=coverage1.tmp.txt -covermode=atomic ./... - # cat coverage1.tmp.txt | grep -v -e "generated.go" -e "_gen.go" | grep -v -e "services.pb.go" -e "services_grpc.pb.go" > coverage1.txt - # env: - # KEPLOY_API_KEY: 81f83aeeedddf453966347dc136c66 - # ENABLE_DEDUP: false - # ENABLE_TEST_EXPORT: true - # KEPLOY_APP_NAME: Keploy-Test-App-2 - # KEPLOY_REPORT_PATH: ./ - - # - name: Test - # run: | - # export PORT=6790 - # curl --silent --location "https://github.com/keploy/keploy/releases/latest/download/keploy_linux_amd64.tar.gz" | tar xz -C /tmp - # sudo mv /tmp/keploy /usr/local/bin && export KEPLOY_MODE=off && keploy & - # export PORT=6789 && export ENABLE_TEST_EXPORT=false && go test -coverpkg=./... -coverprofile=coverage.tmp.txt -covermode=atomic ./... - # cat coverage.tmp.txt | grep -v -e "http/regression/request.go" | grep -v -e "generated.go" -e "_gen.go" | grep -v -e "services.pb.go" -e "services_grpc.pb.go" > coverage.txt - # env: - # ENABLE_DEDUP: true - # ENABLE_TELEMETRY: false - - # - name: Test-withDeDupEnabled - # run: | - # go test -coverpkg=./... -coverprofile=coverage3.tmp.txt -covermode=atomic ./... - # cat coverage3.tmp.txt | grep -v "mode: atomic" | grep -v -e "generated.go" -e "_gen.go" | grep -v -e "services.pb.go" -e "services_grpc.pb.go" > coverage3.txt - # cat coverage1.txt coverage2.txt coverage3.txt > coverage.txt - # env: - # KEPLOY_API_KEY: 81f83aeeedddf453966347dc136c66 - # ENABLE_DEDUP: true - # ENABLE_TEST_EXPORT: false - - -# - uses: codecov/codecov-action@v2 -# with: -# files: ./coverage.txt - # - name: Install goveralls - # run: go install github.com/mattn/goveralls@latest - # - name: Send coverage - # env: - # COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # run: | - # goveralls -coverprofile=coverage.txt -service=github - - - -# - name: Install extra dependencies -# run: npm install -g @semantic-release/exec - - uses: codfish/semantic-release-action@v1 with: dry_run: true @@ -85,3 +27,24 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + build-arm: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: "1.21" + architecture: arm + + - name: Build + run: go build -v ./... + - uses: codfish/semantic-release-action@v1 + with: + dry_run: true + additional_packages: | + ['@semantic-release/exec'] + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/sample-run.yml b/.github/workflows/sample-run.yml index 4938882ce..1bb7ed05e 100755 --- a/.github/workflows/sample-run.yml +++ b/.github/workflows/sample-run.yml @@ -21,31 +21,19 @@ jobs: run: | go build -v ./... - # - name: Setup Java - # uses: actions/setup-java@v3 - # with: - # java-version: "11" - # distribution: "temurin" + build-arm: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - # - name: Setup java Sample project - # run: | - # git clone https://github.com/keploy/samples-java.git && - # curl 'https://repo1.maven.org/maven2/io/keploy/agent/1.2.6/agent-1.2.6.jar' --compressed --output samples-java/agent.jar -slient + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: "1.21" + architecture: arm - # - name: Run Keploy and java project - # run: | - # sudo mkdir /root/keploy-config && - # sudo touch /root/keploy-config/installation-id.yaml && - # echo "ObjectID(\"6400772dd1bc96b3c5ebffec\")" > sudo /root/keploy-config/installation-id.yaml && - # go run ./cmd/server/main.go & - # sudo apt update && - # sudo apt install maven -y && - # cd samples-java && - # export KEPLOY_MODE=test && - # export JAVA_TOOL_OPTIONS=-javaagent:${PWD}/agent.jar && - # count=5 - # for i in $(seq $count); do - # mvn spring-boot:run - # done - # echo installation-id && - # sudo cat /root/keploy-config/installation-id.yaml + - name: Build Keploy + run: | + go build -v ./... \ No newline at end of file From ceeee97e997f4ba6922a77d0d0873fb6670dda59 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 22:32:32 +0530 Subject: [PATCH 4/7] fix: removed arch arm Signed-off-by: Akash Kumar --- .github/workflows/go.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index dd03fd2b8..454bdd196 100755 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -37,7 +37,6 @@ jobs: uses: actions/setup-go@v4 with: go-version: "1.21" - architecture: arm - name: Build run: go build -v ./... From 766da403d4c14ab4d67d3f43e7e2c8d13713859f Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 22:47:15 +0530 Subject: [PATCH 5/7] fix: add arm64 in arch Signed-off-by: Akash Kumar --- .github/workflows/go.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 454bdd196..d2b208b21 100755 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -37,6 +37,7 @@ jobs: uses: actions/setup-go@v4 with: go-version: "1.21" + architecture: arm64 - name: Build run: go build -v ./... From aa608de84b8666bde70bb30f297dff9addc9d368 Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 23:18:28 +0530 Subject: [PATCH 6/7] fix: add run-on-arch Signed-off-by: Akash Kumar --- .github/workflows/go.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index d2b208b21..784fd510e 100755 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -33,6 +33,29 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - uses: uraimo/run-on-arch-action@v2 + with: + arch: armv7 + distro: ubuntu18.04 + shell: /bin/bash + + # Not required, but speeds up builds by storing container images in + # a GitHub package registry. + githubToken: ${{ secrets.GITHUB_TOKEN }} + + install: | + apt-get update -y -q + apt-get upgrade -y -q + curl -O https://storage.googleapis.com/golang/go1.13.5.linux-arm64.tar.gz + tar -xvf go1.13.5.linux-amd64.tar.gz + mv go /usr/local + echo "export GOPATH=$HOME/work" >> ~/.profile + echo "export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin" >> ~/.profile + source ~/.profile + run: | + go version + ls + go build -v ./... - name: Set up Go uses: actions/setup-go@v4 with: From b99e89a7532d3fb6cd861ba3ed2f601701756b0a Mon Sep 17 00:00:00 2001 From: Akash Kumar Date: Mon, 9 Oct 2023 23:22:04 +0530 Subject: [PATCH 7/7] fix: github actions Signed-off-by: Akash Kumar --- .github/workflows/go.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 784fd510e..149acbe0d 100755 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -44,18 +44,11 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} install: | - apt-get update -y -q - apt-get upgrade -y -q - curl -O https://storage.googleapis.com/golang/go1.13.5.linux-arm64.tar.gz - tar -xvf go1.13.5.linux-amd64.tar.gz - mv go /usr/local - echo "export GOPATH=$HOME/work" >> ~/.profile - echo "export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin" >> ~/.profile - source ~/.profile + apt install golang-go run: | go version ls - go build -v ./... + # go build -v ./... - name: Set up Go uses: actions/setup-go@v4 with: