Skip to content

Commit ebeb5e2

Browse files
v1.3.5 (#324)
Closes #321 Closes #320 Closes #322 Supersedes #323 Co-authored by @d33bs FOR THE TEMPLATE MAINTAINER(S) New template version checklist: - [x] I have updated CITATION and CHANGELOG as appropriate. - [x] I have updated lab-website-template-docs as appropriate. - [x] I have checked the testbed as appropriate.
1 parent d515175 commit ebeb5e2

File tree

7 files changed

+27
-22
lines changed

7 files changed

+27
-22
lines changed

.github/workflows/build-preview.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,14 @@ jobs:
4242
id: pages
4343
uses: actions/configure-pages@v4
4444

45-
- uses: jwalton/gh-find-current-pr@master
46-
if: github.event.action != 'closed'
47-
id: pr
48-
with:
49-
state: all
50-
5145
- name: SSH debug
5246
if: runner.debug == '1'
5347
uses: mxschmitt/action-tmate@v3
5448

5549
- name: Build preview version of site
5650
if: github.event.action != 'closed'
5751
run: |
58-
JEKYLL_ENV=production bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path || '' }}/${{ env.PREVIEWS_FOLDER }}/pr-${{ env.pr }}"
59-
env:
60-
pr: ${{ steps.pr.outputs.pr }}
52+
JEKYLL_ENV=production bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path || '' }}/${{ env.PREVIEWS_FOLDER }}/pr-${{ github.event.number }}"
6153
6254
- name: Commit preview to Pages branch
6355
uses: rossjrw/pr-preview-action@v1.4.7

.github/workflows/first-time-setup.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
# clean slate, as if starting from orphan branch
3636
- name: Clear Pages branch
37-
run: rm -rf * .github .docker .gitignore
37+
run: rm -rf ./* .github .docker .gitignore
3838

3939
# prevent GitHub from running Jekyll a second time after build
4040
- name: Make .nojekyll file
@@ -70,8 +70,8 @@ jobs:
7070
run: |
7171
user="${{ github.repository_owner }}"
7272
description="An engaging 1-3 sentence description of your lab."
73-
printf "\nUSER=${user}" >> $GITHUB_ENV
74-
printf "\nDESCRIPTION=${description}" >> $GITHUB_ENV
73+
printf "\nUSER=%s" "$user" >> "$GITHUB_ENV"
74+
printf "\nDESCRIPTION=%s" "$description" >> "$GITHUB_ENV"
7575
7676
- name: Personalize readme for user
7777
run: |
@@ -80,12 +80,12 @@ jobs:
8080
![on-pull-request](../../actions/workflows/on-pull-request.yaml/badge.svg)
8181
![on-schedule](../../actions/workflows/on-schedule.yaml/badge.svg)
8282
83-
# ${{ env.USER }}'s Website
83+
# %s's Website
8484
8585
Visit **[website url](#)** 🚀
8686
8787
_Built with [Lab Website Template](https://greene-lab.gitbook.io/lab-website-template-docs)_
88-
" > README.md
88+
" "${{ env.USER }}" > README.md
8989
9090
- name: Personalize Jekyll config for user
9191
uses: actions/github-script@v7
@@ -119,4 +119,4 @@ jobs:
119119
- name: Commit changed files
120120
uses: stefanzweifel/git-auto-commit-action@v5
121121
with:
122-
commit_message: "Setup repo"
122+
commit_message: "Set up repo"

.github/workflows/update-citations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
repository: ${{ github.event.pull_request.head.repo.full_name }}
3939
ref: ${{ github.head_ref }}
4040

41-
- name: Setup Python
41+
- name: Set up Python
4242
if: github.event.action != 'closed'
4343
uses: actions/setup-python@v5
4444
with:

.github/workflows/versioning.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
steps:
2323
- name: Debug dump
2424
uses: crazy-max/ghaction-dump-context@v2
25+
2526
- if: runner.debug == '1'
2627
uses: mxschmitt/action-tmate@v3
2728

@@ -36,6 +37,13 @@ jobs:
3637
with:
3738
path: pr
3839

40+
- name: Lint actions
41+
run: |
42+
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
43+
./actionlint -color
44+
shell: bash
45+
working-directory: pr
46+
3947
- name: Install packages
4048
run: npm install yaml semver
4149

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
Reference: common-changelog.org
44

5+
## 1.3.5 - 2025-05-12
6+
7+
###
8+
9+
- Fix workflow bug where PR previews on GitHub Actions have broken styles/links/etc.
10+
- Fix tags component relative link bug
11+
- Make Actions workflows a bit more robust
12+
513
## 1.3.4 - 2025-02-03
614

715
### Changed

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# citation metadata for the template itself
22

33
title: "Lab Website Template"
4-
version: 1.3.4
5-
date-released: 2025-02-03
4+
version: 1.3.5
5+
date-released: 2025-05-12
66
url: "https://github.com/greenelab/lab-website-template"
77
authors:
88
- family-names: "Rubinetti"

_includes/tags.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616
{% if include.repo %}
1717
data-repo="{{ include.repo | xml_escape }}"
1818
{% endif %}
19-
{% if link %}
20-
data-link="{{ link | relative_url | xml_escape }}"
21-
{% endif %}
2219
>
2320
{% for tag in tags %}
2421
<a
25-
href="{{ link }}?search=&quot;tag: {{ tag }}&quot;"
22+
href="{{ link | relative_url }}?search=&quot;tag: {{ tag }}&quot;"
2623
class="tag"
2724
data-tooltip="Show items with the tag &quot;{{ tag }}&quot;"
2825
>

0 commit comments

Comments
 (0)