Skip to content

Commit

Permalink
Changes after own review.
Browse files Browse the repository at this point in the history
  • Loading branch information
dumol committed Oct 14, 2024
1 parent 071e0dd commit 5fca988
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/bare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ concurrency:
group: bare-${{ github.ref }}
cancel-in-progress: true

env:
CI: 'true'

jobs:
windows:
# The type of runner that the job will run on
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ concurrency:
group: docker-${{ github.ref }}
cancel-in-progress: true

env:
CI: 'true'

# Using a job name that doesn't contain the OS name, to minimize the risk of
# confusion with the OS names of the containers, which are the relevant ones.
Expand Down
10 changes: 6 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -275,20 +275,22 @@ command_compat() {
echo "## Unsetting CHEVAH_CACHE and CHEVAH_BUILD... ##"
unset CHEVAH_CACHE CHEVAH_BUILD
# Copy over current pythia stuff, as some changes might require it.
echo "## Patching compat code ot use current pythia version... ##"
echo "## Patching compat code to use current pythia version... ##"
execute cp ../../pythia.{conf,sh} ./
# Patch compat to use the current's branch version.
echo -e "\nPYTHON_CONFIGURATION=default@${new_python_ver}" >>pythia.conf
# Copy dist file to local cache, if existing.
execute mkdir cache
# Copy dist file to local cache, if existing. If not, maybe it's online.
cp ../../"$DIST_DIR"/"$PYTHON_BUILD_VERSION.$PYTHIA_VERSION"/* cache/
# Some tests could fail due to causes not related to the new Python.
echo "## Getting compat deps... ##"
execute ./pythia.sh deps
echo "## Running normal compat tests... ##"
execute ./pythia.sh test -vs normal
echo "## Running ci2 compat tests... ##"
execute ./pythia.sh test_ci2
if [ "${CI:-}" = "true" ]; then
echo "## Running ci2 compat tests... ##"
execute ./pythia.sh test_ci2
fi
execute popd
echo "::endgroup::"
}
Expand Down

0 comments on commit 5fca988

Please sign in to comment.