From 26c414cbd472d4304de6ceda92a245466d3db3b7 Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:06:58 +0700 Subject: [PATCH 1/7] Fix --- #jekyll-theme-hydejack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/#jekyll-theme-hydejack b/#jekyll-theme-hydejack index 401886f429..40d4b7391b 160000 --- a/#jekyll-theme-hydejack +++ b/#jekyll-theme-hydejack @@ -1 +1 @@ -Subproject commit 401886f429e784e509fcb9664910f97e4aca05c1 +Subproject commit 40d4b7391b93949d355682a8b000d2e44b0e65dc From e3992d13ef598b7b3eb1868525eb75c50f494d3e Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:22:41 +0700 Subject: [PATCH 2/7] Update workflow --- .github/workflows/jekyll.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index bf548b627c..8ad20daa83 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -34,23 +34,24 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - submodules: true - token: ${{ secrets.JEKYLL_PAT }} + # submodules: true + # token: ${{ secrets.JEKYLL_PAT }} - name: Setup Ruby uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 0 # Increment this number if you need to re-download cached gems - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 16 - - name: Build Jekyll Theme Hydejack - run: cd ./#jekyll-theme-hydejack && npm i && npm run build + # - name: Set up Node.js + # uses: actions/setup-node@v4 + # with: + # node-version: 16 + # - name: Build Jekyll Theme Hydejack + # run: cd ./#jekyll-theme-hydejack && npm i && npm run build - name: Build with Jekyll run: bundle exec jekyll build --destination ./build env: JEKYLL_ENV: production + BUNDLE_GITHUB__COM: x-access-token:${{ secrets.GH_REPO_PAT }} #!! - name: Publish to Cloudflare Pages uses: cloudflare/wrangler-action@v3 id: deploy From abf91df814138230d4f4f87ce42beb605625d73f Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:23:58 +0700 Subject: [PATCH 3/7] Bump cache version --- .github/workflows/jekyll.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 8ad20daa83..41440d1a6e 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -40,7 +40,7 @@ jobs: uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - cache-version: 0 # Increment this number if you need to re-download cached gems + cache-version: 1 # Increment this number if you need to re-download cached gems # - name: Set up Node.js # uses: actions/setup-node@v4 # with: @@ -51,7 +51,7 @@ jobs: run: bundle exec jekyll build --destination ./build env: JEKYLL_ENV: production - BUNDLE_GITHUB__COM: x-access-token:${{ secrets.GH_REPO_PAT }} #!! + BUNDLE_GITHUB__COM: x-access-token:${{ secrets.JEKYLL_PAT }} #!! - name: Publish to Cloudflare Pages uses: cloudflare/wrangler-action@v3 id: deploy From 078ef91ee51071c2c3f707a40b90662ced28ead5 Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:30:10 +0700 Subject: [PATCH 4/7] Revert "Bump cache version" This reverts commit abf91df814138230d4f4f87ce42beb605625d73f. --- .github/workflows/jekyll.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 41440d1a6e..8ad20daa83 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -40,7 +40,7 @@ jobs: uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - cache-version: 1 # Increment this number if you need to re-download cached gems + cache-version: 0 # Increment this number if you need to re-download cached gems # - name: Set up Node.js # uses: actions/setup-node@v4 # with: @@ -51,7 +51,7 @@ jobs: run: bundle exec jekyll build --destination ./build env: JEKYLL_ENV: production - BUNDLE_GITHUB__COM: x-access-token:${{ secrets.JEKYLL_PAT }} #!! + BUNDLE_GITHUB__COM: x-access-token:${{ secrets.GH_REPO_PAT }} #!! - name: Publish to Cloudflare Pages uses: cloudflare/wrangler-action@v3 id: deploy From 54654cef4bede1e1125b66d628e93914512025eb Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:30:13 +0700 Subject: [PATCH 5/7] Revert "Update workflow" This reverts commit e3992d13ef598b7b3eb1868525eb75c50f494d3e. --- .github/workflows/jekyll.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 8ad20daa83..bf548b627c 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -34,24 +34,23 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - # submodules: true - # token: ${{ secrets.JEKYLL_PAT }} + submodules: true + token: ${{ secrets.JEKYLL_PAT }} - name: Setup Ruby uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 0 # Increment this number if you need to re-download cached gems - # - name: Set up Node.js - # uses: actions/setup-node@v4 - # with: - # node-version: 16 - # - name: Build Jekyll Theme Hydejack - # run: cd ./#jekyll-theme-hydejack && npm i && npm run build + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 16 + - name: Build Jekyll Theme Hydejack + run: cd ./#jekyll-theme-hydejack && npm i && npm run build - name: Build with Jekyll run: bundle exec jekyll build --destination ./build env: JEKYLL_ENV: production - BUNDLE_GITHUB__COM: x-access-token:${{ secrets.GH_REPO_PAT }} #!! - name: Publish to Cloudflare Pages uses: cloudflare/wrangler-action@v3 id: deploy From 3dbc600026650715346ff4e7fc7131f9eeacc6fc Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:31:34 +0700 Subject: [PATCH 6/7] Fix --- Gemfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index db3cfe2979..68e0576f50 100644 --- a/Gemfile +++ b/Gemfile @@ -10,12 +10,7 @@ source "https://rubygems.org" # Happy Jekylling! gem "jekyll", "~> 4.3" -case ENV['JEKYLL_ENV'] -when 'development' - gem "jekyll-theme-hydejack", path: "./#jekyll-theme-hydejack" -else - gem "jekyll-theme-hydejack", git: "https://github.com/hydecorp/hydejack-pro", branch: "pro/v9" -end +gem "jekyll-theme-hydejack", path: "./#jekyll-theme-hydejack" # If you are part of the ["Customers" team](https://github.com/orgs/hydecorp/teams/pro-customers), # you can fetch the theme from a private repository. From ba6818d21e09ab2e61c6352250b8328185633e92 Mon Sep 17 00:00:00 2001 From: Florian Klampfer Date: Sun, 8 Sep 2024 15:56:04 +0700 Subject: [PATCH 7/7] Fix blog sidebar image --- .../_posts/2024-09-08-x-marks-the-spot-in-hydejack-9-2.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hydejack/_posts/2024-09-08-x-marks-the-spot-in-hydejack-9-2.md b/hydejack/_posts/2024-09-08-x-marks-the-spot-in-hydejack-9-2.md index 0e43937457..99e3e5eb35 100644 --- a/hydejack/_posts/2024-09-08-x-marks-the-spot-in-hydejack-9-2.md +++ b/hydejack/_posts/2024-09-08-x-marks-the-spot-in-hydejack-9-2.md @@ -8,9 +8,7 @@ image: 1920w: /assets/img/blog/pawel-czerwinski-848z7lbCjoo-unsplash.jpg 960w: /assets/img/blog/pawel-czerwinski-848z7lbCjoo-unsplash@0,5x.jpg 480w: /assets/img/blog/pawel-czerwinski-848z7lbCjoo-unsplash@0,25x.jpg -accent_image: - background: url('/assets/img/blog/pawel-czerwinski-848z7lbCjoo-unsplash.jpg') center/cover - overlay: false +accent_image: /assets/img/blog/pawel-czerwinski-848z7lbCjoo-unsplash.jpg excerpt_separator: ---