Commit 894f0aa
committed
Merge branch 'develop-copilot-verifier-upstream'. Close #622.
**Description**
The `copilot-verifier` was developed outside of this repo, but there's interest
in having all Copilot projects and libraries merged into a main repo for ease
of management.
**Type**
- Management: files need to be moved between repos.
**Additional context**
None.
**Requester**
- Ivan Perez.
**Method to check presence of bug**
Not applicable (not a bug).
**Expected result**
The last state of the `copilot-verifier` is included in this repository,
disregarding history, and adjusting the changelog to make the old issues refer
to `copilot-verifier#<ISSUE_NUM>` so that they are not interpreted as related
to the main Copilot repo.
The following dockerfile checks out the latest version of `copilot-verifier`,
v4.4, and compares it against the version being merged, ignoring differences in
the CHANGELOG (which is expected to be different), checking that there are no
other differences, after which it prints the message "Success":
```Dockerfile
FROM ubuntu:noble
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
RUN apt-get install --yes git
RUN git config --global advice.detachedHead false
CMD git clone $REPO $NAME \
&& cd $NAME \
&& git checkout $COMMIT \
&& cd .. \
&& git clone -b v4.4 https://github.com/Copilot-Language/copilot-verifier copilot-verifier-original \
&& diff --exclude 'CHANGELOG' -r $NAME/copilot-verifier copilot-verifier-original/copilot-verifier \
&& echo "Success"
```
Command (substitute variables based on new path after merge):
```
$ docker run -e "REPO=https://github.com/Copilot-Language/copilot" -e "NAME=copilot" -e "COMMIT=<HASH>" -it copilot-verify-622
```
**Solution implemented**
Copy last state of `copilot-verifier` as subdirectory of main repo.
Adjust Changelog in `copilot-verifier` to make older issues point to correct
repo.
List cabal files explicitly in cabal.project file, without including
copilot-verifier, to prevent CI from failing with older versions of GHC.
**Further notes**
None.File tree
47 files changed
+4752
-1
lines changed- copilot-verifier
- examples/Copilot/Verifier
- Examples
- ShouldFail/Partial
- ShouldPass
- Partial
- exe
- src/Copilot
- Verifier
- test
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
47 files changed
+4752
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
0 commit comments