fix: bundle dist and packaging to save duplication

grafana · Feb 14, 2024 · 74c6c80 · 74c6c80
1 parent 6a1d4eb
commit 74c6c80
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 123 deletions.
diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": ""
         }
       },
-      "version": "e87bbbd61b9b64782371492000c5ce130d172ffe",
-      "sum": "N9EocUYpQ3HT6ZysJxmLt3SI2fi/rZMOgMxnbh9qkDg="
+      "version": "f2ecd4b9e440db32204d56ea3fa464528791dfb7",
+      "sum": "kwWkJCH7fQrx+taP3aG6DbSSogKZJUOJH+zg90LKJk4="
     }
   ],
   "legacyImports": false

diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml
diff --git a/.github/vendor/github.com/grafana/loki-release/main.jsonnet b/.github/vendor/github.com/grafana/loki-release/main.jsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -89,7 +89,6 @@ jobs:
   create-release-pr:
     needs:
     - "dist"
-    - "packages"
     - "fluent-bit"
     - "fluentd"
     - "logcli"
@@ -157,10 +156,11 @@ jobs:
         credentials_json: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
     - env:
         BUILD_IN_CONTAINER: false
+        DRONE_TAG: "${{ needs.version.outputs.version }}"
         IMAGE_TAG: "${{ needs.version.outputs.version }}"
         SKIP_ARM: true
       name: "build artifacts"
-      run: "make dist"
+      run: "make dist packages"
       shell: "bash"
       working-directory: "release"
     - name: "upload build artifacts"
@@ -692,36 +692,6 @@ jobs:
       matrix:
         platform:
         - "linux/amd64"
-  packages:
-    container:
-      image: "grafana/loki-build-image:0.33.0"
-    needs:
-    - "version"
-    runs-on: "ubuntu-latest"
-    steps:
-    - name: "pull code to release"
-      uses: "actions/checkout@v4"
-      with:
-        path: "release"
-        repository: "${{ env.RELEASE_REPO }}"
-    - name: "auth gcs"
-      uses: "google-github-actions/auth@v2"
-      with:
-        credentials_json: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
-    - env:
-        BUILD_IN_CONTAINER: false
-        DRONE_TAG: "${{ needs.version.outputs.version }}"
-      name: "package"
-      run: "make packages"
-      shell: "bash"
-      working-directory: "release"
-    - name: "upload packages"
-      uses: "google-github-actions/upload-cloud-storage@v2"
-      with:
-        destination: "loki-build-artifacts/${{ github.sha }}/packages"
-        parent: false
-        path: "release/dist"
-        process_gcloudignore: false
   promtail:
     needs:
     - "version"

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -89,7 +89,6 @@ jobs:
   create-release-pr:
     needs:
     - "dist"
-    - "packages"
     - "fluent-bit"
     - "fluentd"
     - "logcli"
@@ -157,10 +156,11 @@ jobs:
         credentials_json: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
     - env:
         BUILD_IN_CONTAINER: false
+        DRONE_TAG: "${{ needs.version.outputs.version }}"
         IMAGE_TAG: "${{ needs.version.outputs.version }}"
         SKIP_ARM: false
       name: "build artifacts"
-      run: "make dist"
+      run: "make dist packages"
       shell: "bash"
       working-directory: "release"
     - name: "upload build artifacts"
@@ -692,36 +692,6 @@ jobs:
       matrix:
         platform:
         - "linux/amd64"
-  packages:
-    container:
-      image: "grafana/loki-build-image:0.33.0"
-    needs:
-    - "version"
-    runs-on: "ubuntu-latest"
-    steps:
-    - name: "pull code to release"
-      uses: "actions/checkout@v4"
-      with:
-        path: "release"
-        repository: "${{ env.RELEASE_REPO }}"
-    - name: "auth gcs"
-      uses: "google-github-actions/auth@v2"
-      with:
-        credentials_json: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
-    - env:
-        BUILD_IN_CONTAINER: false
-        DRONE_TAG: "${{ needs.version.outputs.version }}"
-      name: "package"
-      run: "make packages"
-      shell: "bash"
-      working-directory: "release"
-    - name: "upload packages"
-      uses: "google-github-actions/upload-cloud-storage@v2"
-      with:
-        destination: "loki-build-artifacts/${{ github.sha }}/packages"
-        parent: false
-        path: "release/dist"
-        process_gcloudignore: false
   promtail:
     needs:
     - "version"