From 21ed06510630146eebce64d3cdddde0f3baf1199 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 12 Oct 2023 19:39:32 -0700 Subject: [PATCH] Build: Update dependencies * Minor updates to Jekyll plugins https://rubygems.org/gems/jekyll-relative-links https://rubygems.org/gems/jekyll-archives https://rubygems.org/gems/jekyll-feed * Major update to typesense/docsearch-scraper * Major update to GitHub Action images (v2 of GitHub Actions is deprecated due to use of Node.js scripts in these images, where that version is EOL) * Major update to https://github.com/victoriadrake/hydra-link-checker * Add Makefile to ease updates to typesense-minibar. --- .github/workflows/gem.yaml | 2 +- .github/workflows/github-pages.yaml | 2 +- .github/workflows/spider-check.yaml | 24 +++--------------------- .github/workflows/typesense.yaml | 2 +- Makefile | 9 +++++++++ amethyst.gemspec | 4 ++-- 6 files changed, 17 insertions(+), 26 deletions(-) create mode 100644 Makefile diff --git a/.github/workflows/gem.yaml b/.github/workflows/gem.yaml index 16dc45e..d56e353 100644 --- a/.github/workflows/gem.yaml +++ b/.github/workflows/gem.yaml @@ -8,7 +8,7 @@ jobs: gem-push: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Publish Gem package env: GEM_HOST_API_KEY: "${{ secrets.RUBYGEMS_API_PUSH }}" diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml index feab380..fac16a2 100644 --- a/.github/workflows/github-pages.yaml +++ b/.github/workflows/github-pages.yaml @@ -12,7 +12,7 @@ jobs: DEPLOY_DIR: _site/ DEPLOY_BRANCH: gh-pages steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Prepare branch run: | diff --git a/.github/workflows/spider-check.yaml b/.github/workflows/spider-check.yaml index 78260a4..9779120 100644 --- a/.github/workflows/spider-check.yaml +++ b/.github/workflows/spider-check.yaml @@ -18,35 +18,17 @@ jobs: env: # Site address to crawl # - # If empty, will be derived from a CNAME file or the repo name. - # # MY_SITE: https://example.org # MY_SITE: https://example.github.io # MY_SITE: https://example.github.io/my-project/ # - MY_SITE: + MY_SITE: https://qunitjs.github.io/jekyll-theme-amethyst/ runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: jquery/hydra-link-checker - ref: v1.0.2 - - - name: Get site address - run: | - if [[ "$MY_SITE" == "" ]]; then - MY_SITE=$(cat CNAME 2>/dev/null || echo "") - if [[ "$MY_SITE" == "" ]]; then - REPO_BASENAME=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f 2) - REPO_OWNER=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f 1) - if [[ "$REPO_BASENAME" == "${REPO_OWNER}.github.io" ]]; then - MY_SITE="${REPO_OWNER}.github.io" - else - MY_SITE="${REPO_OWNER}.github.io/${REPO_BASENAME}" - fi - fi - echo "MY_SITE=https://${MY_SITE}" >> $GITHUB_ENV - fi + ref: v2.0.0 - name: Run hydra-link-checker run: python3 hydra.py "$MY_SITE" diff --git a/.github/workflows/typesense.yaml b/.github/workflows/typesense.yaml index fa7956b..c91d8b6 100644 --- a/.github/workflows/typesense.yaml +++ b/.github/workflows/typesense.yaml @@ -26,4 +26,4 @@ jobs: -e TYPESENSE_PORT="443" \ -e TYPESENSE_PROTOCOL="https" \ -e CONFIG="$(cat docsearch.config.json | jq -r tostring)" \ - typesense/docsearch-scraper:0.6.0.rc2 + typesense/docsearch-scraper:0.8.0 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c2f9c9c --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +MINIBAR_VERSION=1.0.2 + +.PHONY: deps + +all: deps + +deps: + curl -q https://raw.githubusercontent.com/jquery/typesense-minibar/${MINIBAR_VERSION}/typesense-minibar.css > _sass/typesense-minibar.css + curl -q https://raw.githubusercontent.com/jquery/typesense-minibar/${MINIBAR_VERSION}/typesense-minibar.js > assets/typesense-minibar.js diff --git a/amethyst.gemspec b/amethyst.gemspec index 5f75320..b0491ea 100644 --- a/amethyst.gemspec +++ b/amethyst.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll", ">= 4.3", "< 5.0" spec.add_runtime_dependency "kramdown-parser-gfm", "~> 1.1.0" spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.16.0" - spec.add_runtime_dependency "jekyll-relative-links", "~> 0.6.1" + spec.add_runtime_dependency "jekyll-relative-links", "~> 0.7.0" # For blog - spec.add_runtime_dependency "jekyll-feed", "~> 0.15.1" + spec.add_runtime_dependency "jekyll-feed", "~> 0.17.0" spec.add_runtime_dependency "jekyll-archives", "~> 2.2.1" end