Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitLab CI: Simplify finding binaries (copy #2669) #2671

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 16, 2024

This is an automatic copy of pull request #2669 done by Mergify.
Cherry-pick of b96bf07 has failed:

On branch mergify/copy/1.8/pr-2669
Your branch is up to date with 'origin/1.8'.

You are currently cherry-picking commit b96bf0790.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/build.sh
	modified:   .ci/docker/Dockerfile
	modified:   .ci/get_build_dist.sh
	modified:   .ci/gitlab/benchmark.yml
	modified:   .ci/gitlab/common.yml
	modified:   .gitlab-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/docker/build-and-publish-docker-image.sh
	both modified:   .ci/gitlab/test.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 16, 2024
@DigitalBrains1
Copy link
Member

DigitalBrains1 commented Feb 16, 2024

Note to self: TODO:

@leonschoorl
Copy link
Member

I've clean it up the conflicts.
But this will now probably fail to test on older GHCs, because we haven't created those docker images.

@DigitalBrains1 DigitalBrains1 force-pushed the mergify/copy/1.8/pr-2669 branch 6 times, most recently from f9dd810 to e7a4baf Compare November 5, 2024 16:37
The `build` job creates an artifact that subsequent jobs download to run
the tests. The jobs that actually run the tests cannot use
`cabal list-bin` because the artifact doesn't include enough of the
build data. We can simplify finding the binaries by having the artifact
include symlinks to the binaries, created in the `build` job where
`cabal list-bin` still works.

The artifact included some bits that seem redundant since PR #2403, they
have been removed.

GHC versions in CI are updated to the latest point release, and include
GHC 9.10.1 in preparation for PR #2790.

Fixed a mistake in the Docker image: use the same Ubuntu version for
building and for running.

In GitLab CI, the `after_script` cannot use environment variables set in
`before_script` or `script`. We use `zstd -T$THREADS` in `after_script`.
Before this commit, that rendered to `zstd -T` which happens to mean
"use all cores" and worked fine but was unintended.

Triggered child pipelines (`.ci/gitlab/test.yml`) did not have
`interruptible: true` set. Moved the `default` section into
`.ci/gitlab/common.yml`.

Some GitHub actions were upgraded because the old ones were deprecated.
However, we keep `haskell/actions/setup@v2` for now because the newer
one has issues on macOS with GHC's 8.6-9.0. Notethat it would seem we've
been running an x86-64 GHC on an aarch64 macOS runner for quite some
time already, and continue doing so.

(cherry picked from commit b96bf07)
@DigitalBrains1 DigitalBrains1 force-pushed the mergify/copy/1.8/pr-2669 branch 2 times, most recently from 0129df2 to 48c2890 Compare November 5, 2024 19:45
@DigitalBrains1 DigitalBrains1 enabled auto-merge (squash) November 5, 2024 19:46
@DigitalBrains1 DigitalBrains1 merged commit 03aa6d9 into 1.8 Nov 5, 2024
17 checks passed
@DigitalBrains1 DigitalBrains1 deleted the mergify/copy/1.8/pr-2669 branch November 5, 2024 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants