hotfix(gh: www): use BUILD_WEB env var because makefile also expects it

This commit is contained in:
actionless 2022-06-26 22:23:47 +02:00
parent ad3f60aa41
commit ded96f3b54
1 changed files with 6 additions and 6 deletions

View File

@ -21,6 +21,9 @@ jobs:
main: main:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env:
BUILD_WEB: "/tmp/build-web"
steps: steps:
# Create a cache invalidation key based on the current year + week. # Create a cache invalidation key based on the current year + week.
# This way, packages will be checked for updates once every week. # This way, packages will be checked for updates once every week.
@ -108,9 +111,6 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: Create Build Environment
run: cmake -E make_directory -B "${{ github.workspace }}/build"
- name: Get Awesome website target repo - name: Get Awesome website target repo
env: env:
APIDOC_TOKEN: ${{ secrets.AWESOME_ROBOT_TOKEN || github.token }} APIDOC_TOKEN: ${{ secrets.AWESOME_ROBOT_TOKEN || github.token }}
@ -118,14 +118,14 @@ jobs:
set -e set -e
git clone \ git clone \
https://${APIDOC_TOKEN}@github.com/awesomeWM/awesomeWM.github.io \ https://${APIDOC_TOKEN}@github.com/awesomeWM/awesomeWM.github.io \
"${{ github.workspace }}/build" 2>&1 | sed "s/$APIDOC_TOKEN/APIDOC_TOKEN/g" "$BUILD_WEB" 2>&1 | sed "s/$APIDOC_TOKEN/APIDOC_TOKEN/g"
if [ "${{ github.event_name }}" != 'pull_request' ]; then if [ "${{ github.event_name }}" != 'pull_request' ]; then
branch="${{ github.head_ref || github.ref_name }}" branch="${{ github.head_ref || github.ref_name }}"
else else
branch="pr-${{ github.event.pull_request.number }}" branch="pr-${{ github.event.pull_request.number }}"
fi fi
if [ "$branch" != master ]; then if [ "$branch" != master ]; then
cd "${{ github.workspace }}/build" cd "$BUILD_WEB"
if ! git checkout -b "$branch" "origin/$branch"; then if ! git checkout -b "$branch" "origin/$branch"; then
git checkout -b "$branch" git checkout -b "$branch"
fi fi
@ -145,7 +145,7 @@ jobs:
run: | run: |
set -e set -e
commit_hash=$(git rev-parse --short HEAD) commit_hash=$(git rev-parse --short HEAD)
cd "${{ github.workspace }}/build" cd "$BUILD_WEB"
git config user.name "awesome-robot on GH Actions" git config user.name "awesome-robot on GH Actions"
git config user.email "awesome-robot@users.noreply.github.com" git config user.email "awesome-robot@users.noreply.github.com"
git add --all . git add --all .