diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json index f2ac7928e2595..1522f482c8e09 100644 --- 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 index 99c0b21a7fdfd..efb8639c5457e 100644 --- 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 @@ -89,7 +89,6 @@ jobs: create-release-pr: needs: - "dist" - - "packages" - "loki" runs-on: "ubuntu-latest" steps: @@ -148,10 +147,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" @@ -271,36 +271,6 @@ jobs: - "linux/amd64" - "linux/arm64" - "linux/arm" - 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 test: container: image: "grafana/loki-build-image:0.33.0" diff --git a/.github/vendor/github.com/grafana/loki-release/main.jsonnet b/.github/vendor/github.com/grafana/loki-release/main.jsonnet index 21233df6e4bf4..9723140c58433 100644 --- a/.github/vendor/github.com/grafana/loki-release/main.jsonnet +++ b/.github/vendor/github.com/grafana/loki-release/main.jsonnet @@ -38,9 +38,8 @@ jobs: $.validate(buildImage) { version: $.build.version + $.common.job.withNeeds(validationSteps), dist: $.build.dist(buildImage, skipArm) + $.common.job.withNeeds(['version']), - packages: $.build.packages(buildImage) + $.common.job.withNeeds(['version']), } + std.mapWithKey(function(name, job) job + $.common.job.withNeeds(['version']), imageJobs) + { - local buildImageSteps = ['dist', 'packages'] + std.objectFields(imageJobs), + local buildImageSteps = ['dist'] + std.objectFields(imageJobs), 'create-release-pr': $.release.createReleasePR + $.common.job.withNeeds(buildImageSteps), }, }, diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet index c382b1c89eeb0..7685abc08a158 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet @@ -115,8 +115,9 @@ local releaseLibStep = common.releaseLibStep; BUILD_IN_CONTAINER: false, SKIP_ARM: skipArm, IMAGE_TAG: '${{ needs.version.outputs.version }}', + DRONE_TAG: '${{ needs.version.outputs.version }}', }) - + step.withRun('make dist'), + + step.withRun('make dist packages'), step.new('upload build artifacts', 'google-github-actions/upload-cloud-storage@v2') + step.with({ @@ -125,26 +126,4 @@ local releaseLibStep = common.releaseLibStep; process_gcloudignore: false, }), ]), - packages: function(buildImage) - job.new() - + job.withContainer({ - image: buildImage, - }) - + job.withSteps([ - common.fetchReleaseRepo, - common.googleAuth, - releaseStep('package') - + step.withEnv({ - BUILD_IN_CONTAINER: false, - DRONE_TAG: '${{ needs.version.outputs.version }}', - }) - + step.withRun('make packages'), - step.new('upload packages', 'google-github-actions/upload-cloud-storage@v2') - + step.with({ - path: 'release/dist', - destination: 'loki-build-artifacts/${{ github.sha }}/packages', //TODO: make bucket configurable - process_gcloudignore: false, - parent: false, - }), - ]), } diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index 56145b27328ec..70e2eee3a895c 100644 --- 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 index 2cf1408db82d0..d369a8aaa9b8a 100644 --- 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"