ci: reenable some CI jobs

Not all CI jobs need to be disabled at this point; this reenables as much as possible.
grafana · Mar 19, 2024 · acdff9d · acdff9d
1 parent 492529d
commit acdff9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 35 deletions.
diff --git a/.github/workflows/bump-formula-pr.yml.disabled b/.github/workflows/bump-formula-pr.yml.disabled
@@ -4,33 +4,6 @@ on:
     types: [released]
 
 jobs:
-  homebrew-core:
-    name: homebrew-core
-    runs-on: ubuntu-latest
-    steps:
-    - name: Get latest release
-      uses: rez0n/actions-github-release@main
-      id: latest_release
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        repository: "${{ github.repository }}"
-        type: "stable"
-
-    - name: Update Homebrew formula
-      if: 'steps.latest_release.outputs.release_id == github.event.release.id'
-      uses: dawidd6/action-homebrew-bump-formula@v3
-      with:
-        # Required, custom GitHub access token with the 'public_repo' and 'workflow' scopes
-        token: ${{secrets.HOMEBREW_FORMULA_GH_TOKEN}}
-        # Formula name, required
-        formula: grafana-agent
-        # Optional, will be determined automatically
-        tag: ${{github.ref}}
-        # Optional, will be determined automatically
-        revision: ${{github.sha}}
-        # Optional, if don't want to check for already open PRs
-        force: false # true
-
   homebrew-grafana:
     name: homebrew-grafana
     runs-on: ubuntu-latest
@@ -52,7 +25,7 @@ jobs:
         # Optional, defaults to homebrew/core
         tap: grafana/grafana
         # Formula name, required
-        formula: grafana-agent-flow
+        formula: alloy
         # Optional, will be determined automatically
         tag: ${{github.ref}}
         # Optional, will be determined automatically

diff --git a/...lows/check-linux-build-image.yml.disabled → ...hub/workflows/check-linux-build-image.yml b/...lows/check-linux-build-image.yml.disabled → ...hub/workflows/check-linux-build-image.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           context: ./build-image
           push: false
-          tags: grafana/agent-build-image:latest
+          tags: grafana/alloy-build-image:latest
           build-args: |
             GO_RUNTIME=golang:1.22.1-bullseye
 
@@ -32,6 +32,6 @@ jobs:
         with:
           context: ./build-image
           push: false
-          tags: grafana/agent-build-image:latest
+          tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye
diff --git a/...ws/check-windows-build-image.yml.disabled → ...b/workflows/check-windows-build-image.yml b/...ws/check-windows-build-image.yml.disabled → ...b/workflows/check-windows-build-image.yml
@@ -15,8 +15,8 @@ jobs:
       - name: Create test Windows build image
         uses: mr-smithers-excellent/docker-build-push@v6
         with:
-          image: grafana/agent-build-image
+          image: grafana/alloy-build-image
           tags: latest
           registry: docker.io
           pushImage: false
-          dockerfile: ./build-image/windows/Dockerfile
+          dockerfile: ./build-image/windows/Dockerfile
diff --git a/.github/workflows/helm-release.yml.disabled → .github/workflows/helm-release.yml b/.github/workflows/helm-release.yml.disabled → .github/workflows/helm-release.yml
@@ -1,7 +1,9 @@
 name: Release Helm chart
 on:
-  push:
-    branches: [main]
+  # TODO(rfratto): uncomment these after launch
+  # push:
+  #   branches: [main]
+  workflow_dispatch: {}
 env:
   CR_CONFIGFILE: "${{ github.workspace }}/source/operations/helm/cr.yaml"
   CT_CONFIGFILE: "${{ github.workspace }}/source/operations/helm/ct.yaml"