Skip to content

Commit 280b1f8

Browse files
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.
2 parents 1b03ab5 + 7433ba3 commit 280b1f8

File tree

22 files changed

+4545
-0
lines changed

22 files changed

+4545
-0
lines changed

copilot-bluespec/.dockerignore

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
dist
2+
dist-*
3+
cabal-dev
4+
*.o
5+
*.hi
6+
*.chi
7+
*.chs.h
8+
*.dyn_o
9+
*.dyn_hi
10+
.hpc
11+
.hsenv
12+
.cabal-sandbox/
13+
cabal.sandbox.config
14+
*.prof
15+
*.aux
16+
*.hp
17+
*.eventlog
18+
.stack-work/
19+
cabal.project.local
20+
cabal.project.local~
21+
.HTF/
22+
.ghc.environment.*
23+
copilot-profiling
24+
.DS_Store
25+
.log
26+
27+
Dockerfile
28+
.git
29+
.gitignore

copilot-bluespec/CHANGELOG

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
2025-05-18
2+
* Include `copilot-bluespec` in mainline `copilot` repo. (#623)
3+
4+
2025-05-08
5+
* Version bump (4.4). (copilot-bluespec#43)
6+
7+
2025-05-05
8+
* Version bump (4.3.1). (copilot-bluespec#41)
9+
* Move Copilot.Compile.Bluespec.External out of shared directory.
10+
(copilot-bluespec#36)
11+
* Allow building with filepath-1.5.*. (copilot-bluespec#39)
12+
13+
2025-03-10
14+
* Version bump (4.3). (copilot-bluespec#34)
15+
16+
2025-01-20
17+
* Version bump (4.2). (copilot-bluespec#31)
18+
* Implement missing floating-point operations. (copilot-bluespec#28)
19+
* Allow using same trigger name in multiple declarations.
20+
(copilot-bluespec#30)
21+
22+
2024-11-08
23+
* Version bump (4.1). (copilot-bluespec#25)
24+
25+
2024-09-09
26+
* Version bump (4.0). (copilot-bluespec#23)
27+
* Support translating Copilot array updates to Bluespec.
28+
(copilot-bluespec#19)
29+
30+
2024-08-03
31+
* Test GHC 9.4 through 9.8. (copilot-bluespec#20)
32+
33+
2024-07-11
34+
* Version bump (3.20). (copilot-bluespec#11)
35+
* Support translating Copilot struct updates to Bluespec.
36+
(copilot-bluespec#10)
37+
* Fix a bug in the translation of the signum function.
38+
(copilot-bluespec#14)
39+
* Fix a bug in the translation of floating-point comparisons.
40+
(copilot-bluespec#15)
41+
42+
2024-03-08
43+
* Version bump (3.19). (copilot-bluespec#5)
44+
* Create new library for Bluespec backend.

0 commit comments

Comments
 (0)