diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7582c45..e397d22 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -113,8 +113,8 @@ jobs: run: | set -x # Comment out dynamic branch selection for now - # BOOSTLOOK_BRANCH="${{ (startsWith(github.ref, 'refs/heads/develop') && 'develop') || 'master' }}" - export BOOSTLOOK_BRANCH="${{ github.event.inputs.boostlook_branch || 'master' }}" + BOOSTLOOK_BRANCH="${{ (startsWith(github.ref, 'refs/heads/develop') && 'develop') || 'master' }}" + export BOOSTLOOK_BRANCH ./build.sh - name: Setup Ninja diff --git a/antora-ui/gulp.d/tasks/build.js b/antora-ui/gulp.d/tasks/build.js index 3735f54..5ba0f3d 100644 --- a/antora-ui/gulp.d/tasks/build.js +++ b/antora-ui/gulp.d/tasks/build.js @@ -244,10 +244,6 @@ function getAllTasks (opts, sourcemaps, postcssPlugins, preview, src) { In CI, the file won't be available so it always uses the most recent version. - - CSS Branch handling: - - master: Uses production version of boostlook styling - - develop: Uses Tino Agency's redesign work for staging deployment */ async function fetchBoostlookCss () { log('Fetching boostlook.css file...') @@ -255,8 +251,7 @@ async function fetchBoostlookCss () { const cssDir = ospath.join(__dirname, '..', '..', 'src', 'css') const cssFilePath = ospath.join(cssDir, 'boostlook.css') const boostlookBranch = process.env.BOOSTLOOK_BRANCH || 'master' - const sourceFilename = boostlookBranch === 'develop' ? 'boostlook_tino.css' : 'boostlook.css' - const url = `https://raw.githubusercontent.com/boostorg/boostlook/${boostlookBranch}/${sourceFilename}` + const url = `https://raw.githubusercontent.com/boostorg/boostlook/${boostlookBranch}/boostlook.css` if (skipBoostlook) { log('Skipping boostlook.css download due to --skip-boostlook flag.')