Commit 280b1f8
committed
Merge branch 'develop-copilot-bluespec-upstream'. Close #623.
**Description**
The `copilot-bluespec` 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-bluespec` is included in this repository,
disregarding history, and adjusting the changelog to make the old issues refer
to `copilot-bluespec#<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-bluespec`,
v4.4, and compares it against the version being merged, ignoring changes in
expected files, namely those related to Git, Github or the CHANGELOG, 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-bluespec copilot-bluespec-original \
&& diff --exclude '.git' --exclude '.github' --exclude '.gitignore' --exclude 'CHANGELOG' -r $NAME/copilot-bluespec copilot-bluespec-original \
&& 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-623
```
**Solution implemented**
Copy last state of `copilot-bluespec` as subdirectory of main repo,
disregarding the `.gitignore` and any files under `.github`.
Adjust Changelog in `copilot-bluespec` to make older issues point to correct
repo.
**Further notes**
None.File tree
22 files changed
+4545
-0
lines changed- copilot-bluespec
- src/Copilot/Compile
- Bluespec
- tests
- Test/Copilot/Compile
- Bluespec
22 files changed
+4545
-0
lines changed| 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 | + | |
| 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 | + | |
0 commit comments