uncomment change

smartcontractkit · Feb 22, 2024 · c6bc435 · c6bc435
1 parent ee6afbd
commit c6bc435
Showing 1 changed file with 68 additions and 68 deletions.
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -2,8 +2,8 @@ name: push-master
 
 on:
   push:
-    # branches:
-    #   - master
+    branches:
+      - master
 
 env:
   PACKAGES: "mercury"
@@ -32,77 +32,77 @@ jobs:
           PACKAGES: ${{ env.PACKAGES }}
         run: echo "lint_args_packages=$(echo "./$(echo $PACKAGES | sed 's/,/\/... .\//g;s/$/\/.../')")" | tee -a "${GITHUB_OUTPUT}"
 
-  # ci-lint:
-  #   runs-on: ubuntu-latest
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #     actions: read
-  #   steps:
-  #     - name: ci-lint
-  #       uses: smartcontractkit/.github/actions/ci-lint-go@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-lint-go@0.1.1
-  #       with:
-  #         # grafana inputs
-  #         metrics-job-name: ci-lint
-  #         gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-  #         gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-  #         gc-org-id: ${{ secrets.GRAFANA_INTERNAL_ORG_ID }}
+  ci-lint:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+      actions: read
+    steps:
+      - name: ci-lint
+        uses: smartcontractkit/.github/actions/ci-lint-go@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-lint-go@0.1.1
+        with:
+          # grafana inputs
+          metrics-job-name: ci-lint
+          gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          gc-org-id: ${{ secrets.GRAFANA_INTERNAL_ORG_ID }}
 
-  #         # env inputs
-  #         use-env-files: "true"
-  #         env-files: ./tools/env/ci.env
-  #         # go inputs
-  #         use-go-cache: true
-  #         go-cache-dep-path: "**/go.sum"
-  #         go-version-file: go.mod
-  #         golangci-lint-version: "v1.55.2"
-  #         golangci-lint-args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml ${{ needs.init.outputs.lint_args_packages }}
+          # env inputs
+          use-env-files: "true"
+          env-files: ./tools/env/ci.env
+          # go inputs
+          use-go-cache: true
+          go-cache-dep-path: "**/go.sum"
+          go-version-file: go.mod
+          golangci-lint-version: "v1.55.2"
+          golangci-lint-args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml ${{ needs.init.outputs.lint_args_packages }}
 
-  # ci-test:
-  #   runs-on: ubuntu-latest
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #     actions: read
-  #   steps:
-  #     - name: ci-test
-  #       uses: smartcontractkit/.github/actions/ci-test-go@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-test-go@0.1.1
-  #       with:
-  #         # grafana inputs
-  #         metrics-job-name: ci-test
-  #         gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-  #         gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-  #         gc-org-id: ${{ secrets.GRAFANA_INTERNAL_ORG_ID }}
+  ci-test:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+      actions: read
+    steps:
+      - name: ci-test
+        uses: smartcontractkit/.github/actions/ci-test-go@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-test-go@0.1.1
+        with:
+          # grafana inputs
+          metrics-job-name: ci-test
+          gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          gc-org-id: ${{ secrets.GRAFANA_INTERNAL_ORG_ID }}
 
-  #         # docker inputs
-  #         use-docker-compose: "true"
-  #         docker-compose-workdir: ./tools/docker/setup-postgres
-  #         # env inputs
-  #         use-env-files: "true"
-  #         env-files: ./tools/env/ci.env
-  #         # go inputs
-  #         use-go-cache: "true"
-  #         go-cache-dep-path: "**/go.sum"
-  #         go-version-file: go.mod
-  #         go-test-cmd: make test-ci
+          # docker inputs
+          use-docker-compose: "true"
+          docker-compose-workdir: ./tools/docker/setup-postgres
+          # env inputs
+          use-env-files: "true"
+          env-files: ./tools/env/ci.env
+          # go inputs
+          use-go-cache: "true"
+          go-cache-dep-path: "**/go.sum"
+          go-version-file: go.mod
+          go-test-cmd: make test-ci
 
-  # ci-sonarqube:
-  #   needs: [ci-lint, ci-test]
-  #   if: ${{ always() }}
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: ci-sonarqube
-  #       uses: smartcontractkit/.github/actions/ci-sonarqube@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-sonarqube@0.3.1
-  #       with:
-  #         # grafana inputs
-  #         metrics-job-name: ci-sonarqube
-  #         gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-  #         gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-  #         gc-org-id: ${{ secrets.GRAFANA_INTERNAL_ORG_ID }}
+  ci-sonarqube:
+    needs: [ci-lint, ci-test]
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: ci-sonarqube
+        uses: smartcontractkit/.github/actions/ci-sonarqube@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-sonarqube@0.3.1
+        with:
+          # grafana inputs
+          metrics-job-name: ci-sonarqube
+          gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          gc-org-id: ${{ secrets.GRAFANA_INTERNAL_ORG_ID }}
 
-  #         # sonarqube inputs
-  #         sonar-token: ${{ secrets.SONAR_TOKEN }}
-  #         sonar-host-url: ${{ secrets.SONAR_HOST_URL }}
+          # sonarqube inputs
+          sonar-token: ${{ secrets.SONAR_TOKEN }}
+          sonar-host-url: ${{ secrets.SONAR_HOST_URL }}
 
   cd-release:
     runs-on: ubuntu-latest