From 0574c31b9fd5416bfb53db9e96e0ef802b56f658 Mon Sep 17 00:00:00 2001 From: Jayesh Bapu Ahire Date: Thu, 7 Jan 2021 12:30:33 +0530 Subject: [PATCH 1/5] adds-gha --- .DS_Store | Bin 0 -> 8196 bytes .github/CODEOWNERS | 3 ++ .github/merge-publish.yml | 42 ++++++++++++++++++++++ .github/pr-build.yml | 57 ++++++++++++++++++++++++++++++ .github/publish.yml | 60 ++++++++++++++++++++++++++++++++ mongodb-backup/build.gradle.kts | 4 +-- mongodb/build.gradle.kts | 4 +-- 7 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 .DS_Store create mode 100644 .github/merge-publish.yml create mode 100644 .github/pr-build.yml create mode 100644 .github/publish.yml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6b5a03d7f3d25a28662d7fec24d08d850735114a GIT binary patch literal 8196 zcmeHMJ!>055S^7TvO*vvIE4%@wn>UW4EhB*3*{H63c_IP136fy6DI19Kx$Pk11ZuO zQijy=-*6rLA8fGS?5B5D#*1D)~7BMc>t z?c58k=C14j72=5oG@%j3caw3!TP}zKqJStM3Wx%tz`vjX&TMXtigVvuWfTQOf&Wqg z-XAnNW9%@qXtoXvrUU>+xNI6eqYf}J+F|T4vuHvwr>!283stVfP&OQP&F;Y1VP?^W zld|EYTxR7e6lJm_P8)Ypu|*k00a2i+0N3shX_squI`QlGR(FslGaK-1QSOzbolbv} z_F-*YY=1k8zW&&&@*J+|IXm(*YfOh7Vwc9?_kJ?=Z0hQ%Z}Yh<&JR!Dem7k5*d$#t zD6pO;`0 z*nKX~2d}4JJ{mn%e3qJ2`2;-d<{Lqe5jZ3P2X*rT9CDkVzjvMI_w38uW%eNNhQ`!b zkAza1LWL9>tgOd_4@D23!^^GsPJ@+s{Pn2z3iwdWd>)5<=oR&`Is-b!(=rRRq1yiM z{C%#U>N(e6=J1)X8x!7#=KH8>yxJO_F?N_)G!FuX8osh!&VLp{nkaCO6xgs_n_U0D zseb=|kM2mQiUOj*pDLiDPPfxWlsVN)qWP59=m+TB*e|naLNEkB1n@oo!w{b}TsbCo Um|4UXG Date: Thu, 7 Jan 2021 12:31:00 +0530 Subject: [PATCH 2/5] removes cci --- .circleci/config.yml | 157 ------------------------------------------- 1 file changed, 157 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4d8e0aa..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,157 +0,0 @@ -version: 2.1 - -executors: - gradle_docker: - docker: - # This image isn't used to build Java project, rather to invoke Docker with Gradle. - # The version of Docker on cimg/openjdk tends to be slightly behind cimg/base. - - image: cimg/openjdk:14.0.2 - auth: - username: $DOCKERHUB_USERNAME - password: $DOCKERHUB_PASSWORD - helm: - docker: - - image: hypertrace/helm-gcs-packager:0.3.0 - auth: - username: $DOCKERHUB_USERNAME - password: $DOCKERHUB_PASSWORD - -commands: - gradle: - description: 'Run the provided gradle command' - parameters: - args: - type: string - when: - default: "on_success" - type: enum - enum: ["on_fail", "on_success", "always"] - steps: - - run: - name: << parameters.args >> - command: ./gradlew << parameters.args >> --info --max-workers=2 -Dorg.gradle.jvmargs=-Xmx2g -Dorg.gradle.console=plain - when: << parameters.when >> - setup_build_environment: - description: 'Checkout, restore the cache, and setup docker' - steps: - - checkout - - restore_cache: - keys: # Use gradle version for cache, so it doesn't download every time - - v1-dependencies-{{ checksum "./gradle/wrapper/gradle-wrapper.properties" }} - # The remote docker version is independent from what's installed in the gradle_docker image and defaults to Docker 17. - # Use the latest value from https://circleci.com/docs/2.0/building-docker-images/#docker-version - - setup_remote_docker: - version: 19.03.12 - - run: - name: Dockerhub login - command: echo $DOCKERHUB_PASSWORD | docker login --username $DOCKERHUB_USERNAME --password-stdin - save_populated_cache: - description: "Save the gradle binary to the cache so it doesn't have to redownload" - steps: - - save_cache: - paths: - - ~/.gradle - key: v1-dependencies-{{ checksum "./gradle/wrapper/gradle-wrapper.properties" }} - -jobs: - build: - executor: gradle_docker - steps: - - setup_build_environment - - gradle: - args: dockerBuildImages - - save_populated_cache - merge-publish: - executor: gradle_docker - steps: - - setup_build_environment - - gradle: - args: dockerPushImages - release-publish: - executor: gradle_docker - steps: - - setup_build_environment - - gradle: - args: dockerPushImages - validate-charts: - executor: helm - steps: - - checkout - - run: - name: Helm Charts Lint and Template Render - command: | - helm lint --strict ./helm/ - helm lint --strict ./helm/ --set replicaSet.enabled=true --set backup.enabled=true - helm template --dry-run ./helm/ --set replicaSet.enabled=true --set backup.enabled=true - release-charts: - executor: helm - steps: - - checkout - - run: - name: Add release tag - command: | - git config --global user.email "${CIRCLE_USERNAME}@hypertrace.org" - git config --global user.name "$CIRCLE_USERNAME" - git tag -am "Released by $CIRCLE_USERNAME" $(git describe --abbrev=0 --tags | sed 's/^release-//') - - run: - name: Remove trigger tag - command: git tag -d release-$(git describe --abbrev=0) - - run: - name: Package and Publish Helm Charts - # Read the "name:" from Chart.yaml. The chart version is - - command: | - CHART_VERSION=$(git describe --abbrev=0) - CHART_NAME=$(awk '/^name:/ {print $2}' ./helm/Chart.yaml) - export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/helm-gcs-key.json - echo ${HELM_GCS_CREDENTIALS} > ${GOOGLE_APPLICATION_CREDENTIALS} - helm repo add helm-gcs ${HELM_GCS_REPOSITORY} - helm package --version ${CHART_VERSION} --app-version ${CHART_VERSION} ./helm/ - helm gcs push ${CHART_NAME}-${CHART_VERSION}.tgz helm-gcs --public --retry - - add_ssh_keys: - fingerprints: - - '5e:5d:02:29:b8:8b:08:5b:b0:d3:20:b9:36:d4:72:00' - - run: - name: Update remote tags - command: git push origin refs/tags/$(git describe --abbrev=0) :refs/tags/release-$(git describe --abbrev=0) - -workflows: - version: 2 - build-and-publish: - jobs: - - build: - context: - - dockerhub-read - - validate-charts: - context: - - dockerhub-read - - merge-publish: - context: - - hypertrace-publishing - - dockerhub-read - requires: - - build - - validate-charts - filters: - branches: - only: - - main - - release-publish: - context: - - hypertrace-publishing - - dockerhub-read - filters: - branches: - ignore: /.*/ - tags: - only: /^release-.*/ - - release-charts: - context: - - hypertrace-publishing - - dockerhub-read - requires: - - release-publish - filters: - branches: - ignore: /.*/ - tags: - only: /^release-.*/ From 2f7bb8ea9a3371e1e596c50fceb0220cda46f676 Mon Sep 17 00:00:00 2001 From: Jayesh Bapu Ahire Date: Thu, 7 Jan 2021 13:21:54 +0530 Subject: [PATCH 3/5] directory --- .DS_Store | Bin 8196 -> 6148 bytes .github/{ => workflows}/merge-publish.yml | 0 .github/{ => workflows}/pr-build.yml | 0 .github/{ => workflows}/publish.yml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/merge-publish.yml (100%) rename .github/{ => workflows}/pr-build.yml (100%) rename .github/{ => workflows}/publish.yml (100%) diff --git a/.DS_Store b/.DS_Store index 6b5a03d7f3d25a28662d7fec24d08d850735114a..3017767d37926f0d34dccba887e03a77bbf74b60 100644 GIT binary patch delta 119 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50Cfn;V*`es26 zF_w)5z08Z*IXEU3u+)Q8aWd$EWEqN(RT>5-=jRpxWr0AXA4p(Pm7DM4l9ZF51eE2t zBe`ug%eq63xKyTKRjGt&bwLKQ)d~!od048MH>>kJXXcXN2Ab{)@*~h6-~>#yMO7 diff --git a/.github/merge-publish.yml b/.github/workflows/merge-publish.yml similarity index 100% rename from .github/merge-publish.yml rename to .github/workflows/merge-publish.yml diff --git a/.github/pr-build.yml b/.github/workflows/pr-build.yml similarity index 100% rename from .github/pr-build.yml rename to .github/workflows/pr-build.yml diff --git a/.github/publish.yml b/.github/workflows/publish.yml similarity index 100% rename from .github/publish.yml rename to .github/workflows/publish.yml From 0e0a626b8ee091adbaec32629c22e97b097f0f30 Mon Sep 17 00:00:00 2001 From: Jayesh Bapu Ahire Date: Thu, 7 Jan 2021 20:24:21 +0530 Subject: [PATCH 4/5] addressed aaron's comments on kafka --- .github/workflows/pr-build.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 0cc0c93..0875e53 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -3,7 +3,7 @@ on: push: branches: - main - pull_request_target: + pull_request: branches: - main @@ -15,8 +15,6 @@ jobs: - name: Check out code uses: actions/checkout@v2.3.4 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} fetch-depth: 0 - name: create checksum file @@ -30,12 +28,6 @@ jobs: restore-keys: | gradle-packages-${{ runner.os }}-${{ github.job }} gradle-packages-${{ runner.os }} - - - name: Login to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_READ_USER }} - password: ${{ secrets.DOCKERHUB_READ_TOKEN }} - name: Build with Gradle uses: hypertrace/github-actions/gradle@main @@ -48,8 +40,6 @@ jobs: - name: Check out code uses: actions/checkout@v2.3.4 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} fetch-depth: 0 - name: validate charts From e7fceaae83e335bed1c7441997c1dbfa75c9c757 Mon Sep 17 00:00:00 2001 From: Jayesh Bapu Ahire Date: Thu, 7 Jan 2021 20:31:34 +0530 Subject: [PATCH 5/5] cleanup --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 3017767d37926f0d34dccba887e03a77bbf74b60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHL%}N6?5dPAxZBdYl7mvBu&k5=047P0q5@a)N>;K7IRtnVVe zgM!W^>6&!g>Pd@aAo+GPGnsF{-A%d$Agbeb1t<519V(AFR#;n zo6C0VVEAyY^l;{|naqoEc+e_J7LXnt;t)9;#K(^9v+LL2)B0(yU3-?_shgKvw}=Qa zhNMDF8cf}fm8)!o&0%*loMh6WRjYU!XZN2lx$7}@BU zza