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

Jump to bottom

chore(deps): Update dependencies versions to remove CVE #13833

Merged
merged 1 commit into from
Aug 9, 2024
Merged

chore(deps): Update dependencies versions to remove CVE #13833

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 .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.33.1",
"image": "grafana/loki-build-image:0.33.5",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
Expand Down
8 changes: 4 additions & 4 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.3
image: grafana/loki-build-image:0.33.5
name: loki-mixin-check
when:
event:
Expand All @@ -171,7 +171,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.3
image: grafana/loki-build-image:0.33.5
name: documentation-helm-reference-check
trigger:
ref:
Expand Down Expand Up @@ -1117,7 +1117,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.33.3
image: grafana/loki-build-image:0.33.5
name: build and push
privileged: true
volumes:
Expand Down Expand Up @@ -1340,6 +1340,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 361d32e18fac906a3f2cefddaefa6aa5e85a71664930c41976984e7747a7904f
hmac: 60d68b67ed7a4313ca98b8d3b8814010df9cf98fcc64b3189c4eb5f8d6416ecb

...
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": "634945b73e8eed4f5161ec08810178ddeca7505b",
"sum": "BOnwSjzyOjWwv9ikwJSAgPBNnYHTU2PEDJ0PWY6nr7I="
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56",
"sum": "kVlVZPpPz8d/D6UGK9Hto+NeGy7z8NvGygcB1QboxWw="
}
],
"legacyImports": false
Expand Down
1 change: 1 addition & 0 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.

6 changes: 5 additions & 1 deletion .github/vendor/github.com/grafana/loki-release/workflows/common.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: 1 addition & 1 deletion .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.

203 changes: 158 additions & 45 deletions .github/vendor/github.com/grafana/loki-release/workflows/validate.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: 1 addition & 1 deletion .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.33.3"
"build_image": "grafana/loki-build-image:0.33.5"
"golang_ci_lint_version": "v1.55.1"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/minor-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@main"
with:
build_image: "grafana/loki-build-image:0.33.3"
build_image: "grafana/loki-build-image:0.33.5"
golang_ci_lint_version: "v1.55.1"
release_lib_ref: "main"
skip_validation: false
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- id: "get_github_app_token"
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
name: "get github app token"
uses: "actions/github-app-token@v1"
uses: "actions/create-github-app-token@v1"
with:
app-id: "${{ secrets.APP_ID }}"
owner: "${{ github.repository_owner }}"
Expand Down Expand Up @@ -101,6 +101,8 @@ jobs:
version: "${{ needs.version.outputs.version }}"
runs-on: "ubuntu-latest"
steps:
- name: "clean up build tools cache"
run: "rm -rf /opt/hostedtoolcache"
- name: "pull code to release"
uses: "actions/checkout@v4"
with:
Expand Down Expand Up @@ -141,7 +143,7 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
--entrypoint /bin/sh "grafana/loki-build-image:0.33.5"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
make dist packages
Expand Down Expand Up @@ -753,7 +755,7 @@ jobs:
- id: "get_github_app_token"
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
name: "get github app token"
uses: "actions/github-app-token@v1"
uses: "actions/create-github-app-token@v1"
with:
app-id: "${{ secrets.APP_ID }}"
owner: "${{ github.repository_owner }}"
Expand Down
Loading
Loading