Charles | Revert me when target is ready

weaveworks · Nov 14, 2024 · e5b2e8b · e5b2e8b
1 parent 089dec2
commit e5b2e8b
Showing 1 changed file with 46 additions and 46 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -142,28 +142,28 @@ jobs:
           name: ${{ matrix.docker-image }}
           path: /tmp/${{ matrix.docker-image }}.tar
 
-#  ci-upload-images:
-#    name: CI Upload Images
-#    runs-on: ubuntu-latest
-#    # Make sure we only upload images if tests etc have passed
-#    needs: [ci-go, ci-static, ci-js, ci-build-gitops-image, ci-generate-tag]
-#    permissions:
-#      contents: 'read'
-#      id-token: 'write'
-#    if: github.event_name == 'push'
-#    strategy:
-#      matrix:
-#        docker-image:
-#          - gitops
-#          - gitops-server
-#    steps:
-#      - uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-#      - uses: google-github-actions/setup-gcloud@e30db14379863a8c79331b04a9969f4c1e225e0b # v1.1.1
-#      - name: Download cached docker image
-#        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-#        with:
-#          name: ${{ matrix.docker-image }}
-#          path: /tmp
+  ci-upload-images:
+    name: CI Upload Images
+    runs-on: ubuntu-latest
+    # Make sure we only upload images if tests etc have passed
+    needs: [ci-go, ci-static, ci-js, ci-build-gitops-image, ci-generate-tag]
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+    if: github.event_name == 'push'
+    strategy:
+      matrix:
+        docker-image:
+          - gitops
+          - gitops-server
+    steps:
+      - uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+      - uses: google-github-actions/setup-gcloud@e30db14379863a8c79331b04a9969f4c1e225e0b # v1.1.1
+      - name: Download cached docker image
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: ${{ matrix.docker-image }}
+          path: /tmp
 #      - name: Authenticate to Google Cloud
 #        id: gcloud-auth
 #        uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033 # v1.1.1
@@ -177,30 +177,30 @@ jobs:
 #          docker load --input /tmp/${{ matrix.docker-image }}.tar
 #          docker push "${{ env.CI_CONTAINER_REPOSITORY }}/${{ matrix.docker-image }}:${{ needs.ci-generate-tag.outputs.tag }}"
 
-#  ci-upload-binary:
-#    name: Upload Binary
-#    runs-on: ${{matrix.os}}
-#    needs: [ci-go, ci-static, ci-js, ci-build-gitops-image]
-#    strategy:
-#      matrix:
-#        os: [ubuntu-latest, macOS-latest]
-#    if: github.event_name == 'push'
-#    steps:
-#    - name: Install Go
-#      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
-#      with:
-#        go-version: 1.23.X
-#    - name: Checkout code
-#      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-#    - name: Clean
-#      run: make clean
-#    - id: gitsha
-#      run: |
-#        gitsha=$(git rev-parse --short ${{ github.sha }})
-#        echo "::set-output name=sha::$gitsha"
-#    - name: build
-#      run: |
-#        make gitops
+  ci-upload-binary:
+    name: Upload Binary
+    runs-on: ${{matrix.os}}
+    needs: [ci-go, ci-static, ci-js, ci-build-gitops-image]
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
+    if: github.event_name == 'push'
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+      with:
+        go-version: 1.23.X
+    - name: Checkout code
+      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - name: Clean
+      run: make clean
+    - id: gitsha
+      run: |
+        gitsha=$(git rev-parse --short ${{ github.sha }})
+        echo "::set-output name=sha::$gitsha"
+    - name: build
+      run: |
+        make gitops
 #    - name: publish to s3
 #      uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
 #      with: