Skip to content

Commit

Permalink
Merge branch 'main' into patch-46
Browse files Browse the repository at this point in the history
  • Loading branch information
kflynn authored Oct 21, 2024
2 parents 98a59c5 + ea4e366 commit 9ac2ade
Show file tree
Hide file tree
Showing 283 changed files with 28,520 additions and 5,017 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/on-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
cd $(mktemp -d)

# hugo
scurl -O https://github.com/gohugoio/hugo/releases/download/v0.121.2/hugo_extended_0.121.2_linux-amd64.deb
scurl -O https://github.com/gohugoio/hugo/releases/download/v0.126.1/hugo_extended_0.126.1_linux-amd64.deb
sudo dpkg -i hugo*.deb
rm hugo*.deb

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: |
make build-run.linkerd.io
- uses: actions/upload-artifact@v4.3.1
- uses: actions/upload-artifact@v4.4.3
with:
name: run.linkerd.io
path: tmp/run.linkerd.io/public
Expand All @@ -50,7 +50,7 @@ jobs:
needs: [build]

steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].8
with:
name: run.linkerd.io

Expand Down
2 changes: 1 addition & 1 deletion bin/export-channel-versions
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

releases_url="https://api.github.com/repos/linkerd/linkerd2/releases"
releases_url="https://api.github.com/repos/linkerd/linkerd2/releases?per_page=100"

# Match examples: `"tag_name": "stable-2.7.0",`
stable_tag_regex="\"tag_name\": \"stable-[0-9]+\.[0-9]+\.[0-9]+\""
Expand Down
3 changes: 0 additions & 3 deletions linkerd.io/assets/js/blog-search.js

This file was deleted.

9 changes: 9 additions & 0 deletions linkerd.io/assets/js/follow-linkedin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
setTimeout(function(){
var buttonWrapper = document.querySelector('.linkedin__btn');
widthOriginal = buttonWrapper.getBoundingClientRect().width;
//console.log("-"+widthOriginal);

if(widthOriginal>99){
buttonWrapper.style.display = 'none';
}
}, 2300);
Loading

0 comments on commit 9ac2ade

Please sign in to comment.