Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(build): Update workflow to leverage updates to latest GH and Docker tags #16013

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −25
Open

chore(build): Update workflow to leverage updates to latest GH and Docker tags #16013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "5343bc71d96dc4247021a66c3da8fd5cd4c957dd"
"version": "965213a0fe2632438ab0524d606cb71d414e2388"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "5343bc71d96dc4247021a66c3da8fd5cd4c957dd",
"sum": "/+ozeV2rndtz8N3cZmrWxbNJFI7fkwoDzhECMHG1RoA="
"version": "965213a0fe2632438ab0524d606cb71d414e2388",
"sum": "DXmqwVyytIhA0tHlMQUCLD8buVjjCb04YcIxJ3BLFqM="
}
],
"legacyImports": false
Expand Down
14 changes: 7 additions & 7 deletions .github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .github/vendor/github.com/grafana/loki-release/workflows/workflows.jsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .github/workflows/minor-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ jobs:
loki-docker-driver:
needs:
- "version"
runs-on: "ubuntu-latest"
runs-on: "${{ matrix.runs_on }}"
steps:
- name: "pull release library code"
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -649,9 +649,9 @@ jobs:
mkdir -p images
mkdir -p plugins

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
platform="$(echo "${{ matrix.arch}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
if [[ "${platform}" == "linux/arm64" ]]; then
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
else
Expand All @@ -670,7 +670,7 @@ jobs:
context: "release"
file: "release/clients/cmd/docker-driver/Dockerfile"
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
platforms: "${{ matrix.platform }}"
platforms: "${{ matrix.arch }}"
push: false
tags: "${{ env.IMAGE_PREFIX }}/loki-docker-driver:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}"
- if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
Expand All @@ -689,7 +689,7 @@ jobs:
strategy:
fail-fast: true
matrix:
platform:
include:
- arch: "linux/amd64"
runs_on:
- "github-hosted-ubuntu-x64-small"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/patch-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ jobs:
loki-docker-driver:
needs:
- "version"
runs-on: "ubuntu-latest"
runs-on: "${{ matrix.runs_on }}"
steps:
- name: "pull release library code"
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -649,9 +649,9 @@ jobs:
mkdir -p images
mkdir -p plugins

platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
platform="$(echo "${{ matrix.arch}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
echo "platform=${platform}" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
if [[ "${platform}" == "linux/arm64" ]]; then
echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
else
Expand All @@ -670,7 +670,7 @@ jobs:
context: "release"
file: "release/clients/cmd/docker-driver/Dockerfile"
outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
platforms: "${{ matrix.platform }}"
platforms: "${{ matrix.arch }}"
push: false
tags: "${{ env.IMAGE_PREFIX }}/loki-docker-driver:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}"
- if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
Expand All @@ -689,7 +689,7 @@ jobs:
strategy:
fail-fast: true
matrix:
platform:
include:
- arch: "linux/amd64"
runs_on:
- "github-hosted-ubuntu-x64-small"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ jobs:
buildDir: "release/clients/cmd/docker-driver"
imageDir: "plugins"
imagePrefix: "${{ env.IMAGE_PREFIX }}"
isLatest: "${{ needs.createRelease.outputs.isLatest }}"
isPlugin: true
publishImages:
needs:
Expand Down Expand Up @@ -186,6 +187,7 @@ jobs:
with:
imageDir: "images"
imagePrefix: "${{ env.IMAGE_PREFIX }}"
isLatest: "${{ needs.createRelease.outputs.isLatest }}"
publishRelease:
needs:
- "createRelease"
Expand Down