Skip to content

Commit

Permalink
ci: bump release pipeline to 1.11.4 (#12060)
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney authored Feb 26, 2024
1 parent 201540b commit 4022331
Show file tree
Hide file tree
Showing 12 changed files with 219 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "v1.11.2"
"version": "v1.11.4"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "b59ef022d139609ea1053eb909fc942abad09279",
"sum": "JjoSVKiDoi5YfbFvueo9UXzEB/889MA+c8sSo3HtztQ="
"version": "18a1c46839c610c8c4ed1cf251d2b25a44a46b06",
"sum": "eMlN1tvu1jxKTdWvNfmXESn7JI+Wfu2C1wCabo7P2VQ="
}
],
"legacyImports": false
Expand Down
2 changes: 1 addition & 1 deletion .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;

local releaseLibRef = 'v1.11.2';
local releaseLibRef = 'v1.11.4';
local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
{
'patch-release-pr.yml': std.manifestYamlDoc(
Expand Down

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

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

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

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

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

46 changes: 40 additions & 6 deletions .github/workflows/minor-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ concurrency:
env:
DOCKER_USERNAME: "grafana"
IMAGE_PREFIX: "grafana"
RELEASE_LIB_REF: "v1.11.2"
RELEASE_LIB_REF: "v1.11.4"
RELEASE_REPO: "grafana/loki"
SKIP_VALIDATION: false
USE_GITHUB_APP_TOKEN: true
VERSIONING_STRATEGY: "always-bump-minor"
jobs:
check:
uses: "grafana/loki-release/.github/workflows/[email protected].2"
uses: "grafana/loki-release/.github/workflows/[email protected].4"
with:
build_image: "grafana/loki-build-image:0.29.3-go1.20.10"
golang_ci_lint_version: "v1.51.2"
release_lib_ref: "v1.11.2"
release_lib_ref: "v1.11.4"
skip_validation: false
use_github_app_token: true
create-release-pr:
needs:
- "dist"
Expand Down Expand Up @@ -49,6 +51,22 @@ jobs:
run: |
echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
working-directory: "release"
- id: "get_github_app_token"
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
name: "get github app token"
uses: "actions/github-app-token@v1"
with:
app-id: "${{ secrets.APP_ID }}"
owner: "${{ github.repository_owner }}"
private-key: "${{ secrets.APP_PRIVATE_KEY }}"
- id: "github_app_token"
name: "set github token"
run: |
if [[ "${USE_GITHUB_APP_TOKEN}" == "true" ]]; then
echo "token=${{ steps.get_github_app_token.outputs.token }}" >> $GITHUB_OUTPUT
else
echo "token=${{ secrets.GH_TOKEN }}" >> $GITHUB_OUTPUT
fi
- env:
SHA: "${{ github.sha }}"
id: "release"
Expand All @@ -66,7 +84,7 @@ jobs:
--repo-url "${{ env.RELEASE_REPO }}" \
--separate-pull-requests false \
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token "${{ secrets.GH_TOKEN }}" \
--token "${{ steps.github_app_token.outputs.token }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
working-directory: "lib"
Expand Down Expand Up @@ -691,6 +709,22 @@ jobs:
run: |
echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
working-directory: "release"
- id: "get_github_app_token"
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
name: "get github app token"
uses: "actions/github-app-token@v1"
with:
app-id: "${{ secrets.APP_ID }}"
owner: "${{ github.repository_owner }}"
private-key: "${{ secrets.APP_PRIVATE_KEY }}"
- id: "github_app_token"
name: "set github token"
run: |
if [[ "${USE_GITHUB_APP_TOKEN}" == "true" ]]; then
echo "token=${{ steps.get_github_app_token.outputs.token }}" >> $GITHUB_OUTPUT
else
echo "token=${{ secrets.GH_TOKEN }}" >> $GITHUB_OUTPUT
fi
- id: "version"
name: "get release version"
run: |
Expand All @@ -703,10 +737,10 @@ jobs:
--manifest-file .release-please-manifest.json \
--pull-request-title-pattern "chore\${scope}: release\${component} \${version}" \
--release-type simple \
--repo-url="${{ env.RELEASE_REPO }}" \
--repo-url "${{ env.RELEASE_REPO }}" \
--separate-pull-requests false \
--target-branch "${{ steps.extract_branch.outputs.branch }}" \
--token="${{ secrets.GH_TOKEN }}" \
--token "${{ steps.github_app_token.outputs.token }}" \
--versioning-strategy "${{ env.VERSIONING_STRATEGY }}"
cat release.json
Expand Down
Loading

0 comments on commit 4022331

Please sign in to comment.