From: Derrick Stolee <derrickstolee@github.com>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/2] ci: also run the `scalar` tests
Date: Thu, 2 Jun 2022 09:35:54 -0400 [thread overview]
Message-ID: <3c6d4a5c-8b39-8771-f578-0ea3c5b57869@github.com> (raw)
In-Reply-To: <6ad0d3d401da7787d0e7afb3f804b705731bf2dd.1654160735.git.gitgitgadget@gmail.com>
On 6/2/2022 5:05 AM, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Since Scalar depends on `libgit.a`, it makes sense to ensure in the CI
> and the PR builds that it does not get broken in case of industrious
> refactorings of the core Git code (speaking from experience here).
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> .github/workflows/main.yml | 15 +++++++++++++++
> ci/run-build-and-tests.sh | 2 ++
> ci/run-test-slice.sh | 5 +++++
> 3 files changed, 22 insertions(+)
>
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index c35200defb9..785222aa7b3 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -91,6 +91,13 @@ jobs:
> HOME: ${{runner.workspace}}
> NO_PERL: 1
> run: . /etc/profile && ci/make-test-artifacts.sh artifacts
> + - name: build Scalar
> + shell: bash
> + run: |
> + make -C contrib/scalar &&
> + mkdir -p artifacts/bin-wrappers artifacts/contrib/scalar &&
> + cp contrib/scalar/scalar.exe artifacts/contrib/scalar/ &&
> + cp bin-wrappers/scalar artifacts/bin-wrappers/
I see later you have a "copy Scalar" step which has some duplication
here. The only difference is that you have "make -C contrib/scalar".
Doesn't Scalar get built in our basic "make" build when the
environment includes INCLUDE_SCALAR=YesPlease? So, for that reason I
expected the environment to change, but not need this "make -C ..."
> - name: zip up tracked files
> run: git archive -o artifacts/tracked.tar.gz HEAD
> - name: upload tracked files and build artifacts
> @@ -161,6 +168,8 @@ jobs:
> run: compat\vcbuild\vcpkg_copy_dlls.bat release
> - name: generate Visual Studio solution
> shell: bash
> + env:
> + INCLUDE_SCALAR: YesPlease
This is a bit isolated. Is there a way to specify the environment
more generally?
> run: |
> cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
> -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
> @@ -174,6 +183,12 @@ jobs:
> run: |
> mkdir -p artifacts &&
> eval "$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts NO_GETTEXT=YesPlease 2>&1 | grep ^tar)"
> + - name: copy Scalar
> + shell: bash
> + run: |
> + mkdir -p artifacts/bin-wrappers artifacts/contrib/scalar &&
> + cp contrib/scalar/scalar.exe artifacts/contrib/scalar/ &&
> + cp bin-wrappers/scalar artifacts/bin-wrappers/
> - name: zip up tracked files
> run: git archive -o artifacts/tracked.tar.gz HEAD
> - name: upload tracked files and build artifacts
> diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
> index 280dda7d285..661edb85d1b 100755
> --- a/ci/run-build-and-tests.sh
> +++ b/ci/run-build-and-tests.sh
> @@ -51,4 +51,6 @@ esac
> make $MAKE_TARGETS
> check_unignored_build_artifacts
>
> +make -C contrib/scalar $MAKE_TARGETS
> +
Again, this should "just work" when using INCLUDE_SCALAR in the
environment, right?
> save_good_tree
> diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
> index f8c2c3106a2..b741fd8f361 100755
> --- a/ci/run-test-slice.sh
> +++ b/ci/run-test-slice.sh
> @@ -14,4 +14,9 @@ make --quiet -C t T="$(cd t &&
> ./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
> tr '\n' ' ')"
>
> +if test 0 = "$1"
> +then
> + make -C contrib/scalar test
> +fi
> +
This is still necessary for now.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-06-02 13:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 9:05 [PATCH 0/2] Integrate Scalar into the CI builds Johannes Schindelin via GitGitGadget
2022-06-02 9:05 ` [PATCH 1/2] cmake: optionally build `scalar`, too Johannes Schindelin via GitGitGadget
2022-06-02 10:18 ` Ævar Arnfjörð Bjarmason
2022-06-02 9:05 ` [PATCH 2/2] ci: also run the `scalar` tests Johannes Schindelin via GitGitGadget
2022-06-02 10:24 ` Ævar Arnfjörð Bjarmason
2022-06-02 13:35 ` Derrick Stolee [this message]
2022-06-03 10:33 ` Johannes Schindelin
2022-06-02 14:00 ` [PATCH 0/2] Integrate Scalar into the CI builds Derrick Stolee
2022-06-02 14:13 ` Ævar Arnfjörð Bjarmason
2022-06-02 14:30 ` Derrick Stolee
2022-06-03 10:04 ` Johannes Schindelin
2022-06-03 10:36 ` Ævar Arnfjörð Bjarmason
2022-06-13 21:03 ` Johannes Schindelin
2022-06-23 10:41 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3c6d4a5c-8b39-8771-f578-0ea3c5b57869@github.com \
--to=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).