Skip to content

Commit

Permalink
build(deps): update linkerd/dev from v30 to v44
Browse files Browse the repository at this point in the history
  • Loading branch information
olix0r committed Dec 5, 2024
1 parent 55a4e0a commit ab922bf
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkerd-website",
"image": "ghcr.io/linkerd/dev:v30",
"image": "ghcr.io/linkerd/dev:v44",
"onCreateCommand": ".devcontainer/on-create.sh",
"extensions": [
"DavidAnson.vscode-markdownlint",
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@ name: install
on:
pull_request:
paths:
- .github/workflows/install.yml
- Makefile
- run.linkerd.io/public/install*

jobs:
lint:
name: Lint install script
runs-on: ubuntu-latest
container:
image: ghcr.io/linkerd/dev:v39
options: --user root
steps:
- uses: linkerd/dev/actions/setup-tools@2317e2bb68e049d4e964b5a16a28a2b629345466
- name: Checkout code
uses: actions/checkout@v4

- name: On create
run: |
.devcontainer/on-create.sh
- name: Lint install script
run: |
make shellcheck
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ jobs:
publish:
name: Publish
runs-on: ubuntu-latest
container:
image: ghcr.io/linkerd/dev:v39
options: --user root
steps:
- uses: linkerd/dev/actions/setup-tools@2317e2bb68e049d4e964b5a16a28a2b629345466
- name: Checkout code
uses: actions/checkout@v4

Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@ name: validate
on:
pull_request:
paths:
- .github/workflows/validate.yml
- linkerd.io/**

jobs:
linkerd_io:
name: Validate generated HTML
runs-on: ubuntu-latest
container:
image: ghcr.io/linkerd/dev:v39
options: --user root
steps:
- uses: linkerd/dev/actions/setup-tools@2317e2bb68e049d4e964b5a16a28a2b629345466
- name: Checkout code
uses: actions/checkout@v4

- name: On create
run: |
.devcontainer/on-create.sh
run: .devcontainer/on-create.sh

- name: Lint markdown
run: |
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Source code for the linkerd.io website.
```bash
docker run \
--mount type=bind,source="$(pwd)",target=/website --workdir=/website \
ghcr.io/linkerd/dev:v39 sh -c ".devcontainer/on-create.sh && make lint check"
ghcr.io/linkerd/dev:v44 sh -c ".devcontainer/on-create.sh && make lint check"
```

1. Install Hugo to run the site locally:
Expand Down Expand Up @@ -109,13 +109,13 @@ main from slate-linkerd and add it to the public dir.
### Notes
- This does not update api.linkerd.io, see the section for that specifically to
* This does not update api.linkerd.io, see the section for that specifically to
update it.
- There is no caching in front of run.linkerd.io and versioncheck.linkerd.io.
* There is no caching in front of run.linkerd.io and versioncheck.linkerd.io.
You should see updates there immediately.
- There is caching for non-html pages in front of linkerd.io. If you're updating
* There is caching for non-html pages in front of linkerd.io. If you're updating
a non-html page for linkerd.io, it might be worth flushing the cache
(cloudflare) and waiting awhile.

Expand Down
2 changes: 1 addition & 1 deletion run.linkerd.io/public/install
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case $OS in
exit 1
;;
esac
OS=$(echo $OS | tr '[:upper:]' '[:lower:]')
OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')

checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
echo "Failed to find checksum binary. Please install openssl or shasum."
Expand Down
2 changes: 1 addition & 1 deletion run.linkerd.io/public/install-edge
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ case $OS in
exit 1
;;
esac
OS=$(echo $OS | tr '[:upper:]' '[:lower:]')
OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')

checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
echo "Failed to find checksum binary. Please install openssl or shasum."
Expand Down

0 comments on commit ab922bf

Please sign in to comment.