Skip to content

Commit 9353683

Browse files
committed
Miscellaneous GitHub Workflows improvements.
- Unix source package created for a release build will extract in a subdirectory rather than the current directory. - Quick build test for Windows will now use VS 2015 build tools (currently needed for `cmedit*.dll`).
1 parent 0f65b61 commit 9353683

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

.github/workflows/release_build.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,30 @@ jobs:
7171
echo "::group::Files and directories created by prebuild:"
7272
echo "${prebuild_made}"
7373
echo "::endgroup::"
74-
tarfile="povunix-v${POV_RAY_FULL_VERSION}.tar"
74+
tarbase="povunix-v${POV_RAY_FULL_VERSION}-src"
75+
tarfile="${tarbase}.tar"
7576
# Bundle relevant portions of the original source tree, making sure
7677
# to exclude interim products placed there by the prebuild process.
77-
tar -chWf "${tarfile}" \
78-
--anchored \
79-
--exclude="*Makefile.am" \
80-
--exclude="unix/prebuild*" \
81-
--exclude="unix/scripts*" \
82-
--exclude="platform/windows" \
83-
--exclude="vfe/win" \
84-
doc platform source unix vfe \
78+
tar -chf "${tarfile}" \
79+
--anchored \
80+
--exclude="*Makefile.am" \
81+
--exclude="unix/prebuild*" \
82+
--exclude="unix/scripts*" \
83+
--exclude="platform/windows" \
84+
--exclude="vfe/win" \
85+
--transform "s,^,${tarbase}/," \
86+
doc platform source unix vfe \
8587
LICENSE README.md changes.txt revision.txt
8688
# Add everything created by the prebuild process, except for some
8789
# interim products created by the prebuild process.
8890
# (Note that some files may have already been added by the previous
8991
# command, so we're using `-u` instead of `-r` to avoid duplicates.)
90-
tar -uhWf "${tarfile}" \
91-
--anchored \
92-
--exclude="*Makefile.am" \
93-
--exclude="configure.ac" \
94-
--exclude="bootstrap" \
92+
tar -uhf "${tarfile}" \
93+
--anchored \
94+
--exclude="*Makefile.am" \
95+
--exclude="configure.ac" \
96+
--exclude="bootstrap" \
97+
--transform "s,^,${tarbase}/," \
9598
${prebuild_made}
9699
# Compress bundle into proper tarball
97100
gzip "${tarfile}"

.github/workflows/test_build_quick.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
build_windows:
6969
name: 'Windows Build Test'
70-
runs-on: windows-latest
70+
runs-on: windows-2016
7171
steps:
7272

7373
- name: 'Check out Repository'
@@ -83,7 +83,7 @@ jobs:
8383
solution: vs2015
8484
configuration: Release
8585
platform: x64
86-
toolset: v142
86+
toolset: v140
8787
msbuild-options: ''
8888
- name: 'Sanity-Check Working Tree'
8989
uses: POV-Ray/povray/.github/actions/git_check_repo@gh-actions-v1

0 commit comments

Comments
 (0)