Skip to content

Commit

Permalink
Merge branch 'main' into WEBDEV-1760
Browse files Browse the repository at this point in the history
  • Loading branch information
pcolmer authored May 20, 2024
2 parents bd63fc7 + c6776ba commit 240ac3c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: self-hosted
steps:
- name: Fetch git repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.6
with:
fetch-depth: 0
path: website
Expand All @@ -28,12 +28,15 @@ jobs:
TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Merge test branch
uses: linaro-its/merge-test-branch@v2.6
uses: linaro-its/merge-test-branch@v2.7
with:
path: website

- name: Build site
run: cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
run: |
source ~/.nvm/nvm.sh
nvm use 20
cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
env:
TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: self-hosted
steps:
- name: Fetch git repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.6
with:
path: website

Expand All @@ -24,6 +24,7 @@ jobs:

- name: set branch env
run: echo "BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV

- name: security.txt
# If running on main branch, add signed security.txt file to repo before building
if: env.BRANCH == 'main'
Expand All @@ -38,7 +39,10 @@ jobs:
fi
- name: Build site
run: cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
run: |
source ~/.nvm/nvm.sh
nvm use 20
cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
- name: Check links
run: /srv/github-action-scripts/check-links.sh ${{ github.workspace }}/website/dist
Expand Down

0 comments on commit 240ac3c

Please sign in to comment.