diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cfe58a3..b140e48 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,20 +27,20 @@ jobs: EDITOR_REV=$(nix flake metadata . --json 2>/dev/null | jq --raw-output '.locks.nodes."d2df-editor".locked.rev') RES_REV=$(nix flake metadata . --json 2>/dev/null | jq --raw-output '.locks.nodes."doom2df-res".locked.rev') - D2DF_PATH=$(nix eval '.#dfInputs' --json 2>/dev/null | jq '."x86_64-linux"."d2df-sdl"') - EDITOR_PATH=$(nix eval '.#dfInputs' --json 2>/dev/null | jq '."x86_64-linux"."d2df-editor"') - RES_PATH=$(nix eval '.#dfInputs' --json 2>/dev/null | jq '."x86_64-linux"."doom2df-res"') + D2DF_PATH=$(nix eval '.#dfInputs' --json 2>/dev/null | jq --raw-output '."x86_64-linux"."d2df-sdl"') + EDITOR_PATH=$(nix eval '.#dfInputs' --json 2>/dev/null | jq --raw-output '."x86_64-linux"."d2df-editor"') + RES_PATH=$(nix eval '.#dfInputs' --json 2>/dev/null | jq --raw-output '."x86_64-linux"."doom2df-res"') - D2DF_LAST_COMMIT_DATE=$(git log --git-dir "$(D2DF_PATH)/.git" -1 --format="%ad" --date=iso) - EDITOR_LAST_COMMIT_DATE=$(git log --git-dir "$(EDITOR_PATH)/.git" -1 --format="%ad" --date=iso) - RES_LAST_COMMIT_DATE=$(git log --git-dir "$(RES_PATH)/.git" -1 --format="%ad" --date=iso) + D2DF_LAST_COMMIT_DATE=$(git log --git-dir $D2DF_PATH/.git -1 --format="%ad" --date=iso) + EDITOR_LAST_COMMIT_DATE=$(git log --git-dir $EDITOR_PATH/.git -1 --format="%ad" --date=iso) + RES_LAST_COMMIT_DATE=$(git log --git-dir $RES_PATH/.git" -1 --format="%ad" --date=iso) echo "D2DF_REV=$D2DF_REV" >> "$GITHUB_ENV" echo "EDITOR_REV=$RES_REV" >> "$GITHUB_ENV" echo "RES_REV=$RES_REV" >> "$GITHUB_ENV" - echo "D2DF_LAST_COMMIT_DATE=$D2DF_LAST_COMMIT_DATE" >> "$GITHUB_ENV" - echo "EDITOR_LAST_COMMIT_DATE=$EDITOR_LAST_COMMIT_DATE" >> "$GITHUB_ENV" - echo "RES_LAST_COMMIT_DATE=$RES_LAST_COMMIT_DATE" >> "$GITHUB_ENV" + echo "D2DF_LAST_COMMIT_DATE=\"$D2DF_LAST_COMMIT_DATE\"" >> "$GITHUB_ENV" + echo "EDITOR_LAST_COMMIT_DATE=\"$EDITOR_LAST_COMMIT_DATE\"" >> "$GITHUB_ENV" + echo "RES_LAST_COMMIT_DATE=\"$RES_LAST_COMMIT_DATE\"" >> "$GITHUB_ENV" printf 'This build has the following inputs:\nd2df-sdl: %s\ndoom2d-res: %s\nd2df-editor: %s' $D2DF_REV $RES_REV $EDITOR_REV > release_body - name: Build debug APK @@ -59,9 +59,9 @@ jobs: cp result/* build/assets/ nix build .#legacyPackages.x86_64-linux.mingw.byArch.mingw32.gameExecutablePath cp result/* build/bin/ - find . -type f -iname 'doom2df*' -exec touch -d ${{ env.D2DF_LAST_COMMIT_DATE }} {} \; - find . -type f -iname 'editor*' -exec touch -d ${{ env.EDITOR_LAST_COMMIT_DATE }} {} \; - find . -type f -exec touch -d ${{ env.RES_LAST_COMMIT_DATE }} {} \; + find . -type f -iname 'doom2df*' -exec touch -d "${{env.D2DF_LAST_COMMIT_DATE}}" {} \; + find . -type f -iname 'editor*' -exec touch -d "${{env.EDITOR_LAST_COMMIT_DATE}}" {} \; + find . -type f -exec touch -d "${{env.RES_LAST_COMMIT_DATE}}"" {} \; cp build/bin/* doom2df-win32 cp build/assets/* doom2df-win32