From 9bc1280c2f2cbd5692b5fedf2add6455f0135af0 Mon Sep 17 00:00:00 2001 From: talisein Date: Thu, 17 Aug 2023 12:18:26 -0700 Subject: [PATCH 1/2] Move 'My Task' after 'Life in the Temple' (#17) https://forums.j-novel.club/post/302612 --- src/part4_defs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/part4_defs.h b/src/part4_defs.h index d600b9e..ef5e3a6 100644 --- a/src/part4_defs.h +++ b/src/part4_defs.h @@ -420,12 +420,12 @@ namespace part_4_defs { volume::SSC1, "Styles/stylesheet.css"sv, "text/css"sv, std::nullopt, false }, { volume::P4V4, "Text/chapter2.xhtml"sv, "application/xhtml+xml"sv, "Meeting the Scholars"sv, true }, - -{ volume::SSC1, "Text/chapter20.xhtml"sv, "application/xhtml+xml"sv, "Charlotte — My Task"sv, true }, - { volume::P4V4, "Text/chapter3.xhtml"sv, "application/xhtml+xml"sv, "Life in the Temple"sv, true }, { volume::P4V4, "Text/insert2.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true }, { volume::P4V4, "Text/chapter3_1.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true }, + +{ volume::SSC1, "Text/chapter20.xhtml"sv, "application/xhtml+xml"sv, "Charlotte — My Task"sv, true }, + { volume::P4V4, "Text/chapter4.xhtml"sv, "application/xhtml+xml"sv, "Schwartz’s and Weiss’s Outfits"sv, true }, { volume::P4V4, "Text/chapter5.xhtml"sv, "application/xhtml+xml"sv, "Magic Ink"sv, true }, { volume::P4V4, "Text/insert3.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true }, From e9bfcc0527c991ef832b49965b1534c72beab290 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 02:27:02 -0700 Subject: [PATCH 2/2] Bump actions/checkout from 3 to 4 (#18) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0733f64..b3c9f3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,7 +78,7 @@ jobs: continue-on-error: ${{ matrix.is-experimental }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - if: ${{ matrix.compiler == 'clang' && matrix.flavor == 'ubuntu' }} name: Install clang ubuntu @@ -316,7 +316,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create Release id: create_release