Skip to content

Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7 #7657

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 17, 2021
Merged

Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7 #7657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f40e5d
Switch from 8.10.4 to 8.10.7 for bootstraps in Makefile
Mikolaj Sep 17, 2021
50f6f81
Generate and regenerate bootstrap/ files
Mikolaj Sep 17, 2021
f0c5643
Get rid of 8.10.4 bootstrap/ files, no longer generated in Makefiles
Mikolaj Sep 17, 2021
aaaf6ba
Update bootstrap CI switching GHC from 8.10.4 to 8.10.7
Mikolaj Sep 17, 2021
c3df94e
Update boostrap CI to the ghcup format GHA now uses
Mikolaj Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v2
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json

- name: Smoke test
run: |
Expand All @@ -40,17 +40,17 @@ jobs:
- name: Install GHC
run: |
cd $(mktemp -d)
curl -sLO "https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-apple-darwin.tar.xz"
curl -sLO "https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-apple-darwin.tar.xz"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this? Why not use ghcup as well? It's also pre-installed on mac.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I will try that on the master branch version of this PR. This one I will leave in peace.

tar -xJf ghc-*.tar.xz
cd ghc-*
./configure --prefix=/opt/ghc/8.10.4
./configure --prefix=/opt/ghc/8.10.7
sudo make install
- uses: actions/checkout@v2

# We use linux dependencies
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.7/bin/ghc -d bootstrap/linux-8.10.7.json

- name: Smoke test
run: |
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,15 @@ bootstrap-plans-linux: phony
cp dist-newstyle/cache/plan.json bootstrap/linux-8.6.5.plan.json
cabal v2-build --project=cabal.project.release --with-compiler ghc-8.8.4 --dry-run cabal-install:exe:cabal
cp dist-newstyle/cache/plan.json bootstrap/linux-8.8.4.plan.json
cabal v2-build --project=cabal.project.release --with-compiler ghc-8.10.4 --dry-run cabal-install:exe:cabal
cp dist-newstyle/cache/plan.json bootstrap/linux-8.10.4.plan.json
cabal v2-build --project=cabal.project.release --with-compiler ghc-8.10.7 --dry-run cabal-install:exe:cabal
cp dist-newstyle/cache/plan.json bootstrap/linux-8.10.7.plan.json

bootstrap-jsons-linux: phony
@if [ $$(uname) != "Linux" ]; then echo "Not Linux"; false; fi
cabal v2-build --builddir=dist-newstyle-bootstrap --project=cabal.project.bootstrap cabal-bootstrap-gen
cabal v2-run -vnormal+stderr --builddir=dist-newstyle-bootstrap --project=cabal.project.bootstrap cabal-bootstrap-gen -- bootstrap/linux-8.6.5.plan.json | python3 -m json.tool | tee bootstrap/linux-8.6.5.json
cabal v2-run -vnormal+stderr --builddir=dist-newstyle-bootstrap --project=cabal.project.bootstrap cabal-bootstrap-gen -- bootstrap/linux-8.8.4.plan.json | python3 -m json.tool | tee bootstrap/linux-8.8.4.json
cabal v2-run -vnormal+stderr --builddir=dist-newstyle-bootstrap --project=cabal.project.bootstrap cabal-bootstrap-gen -- bootstrap/linux-8.10.4.plan.json | python3 -m json.tool | tee bootstrap/linux-8.10.4.json
cabal v2-run -vnormal+stderr --builddir=dist-newstyle-bootstrap --project=cabal.project.bootstrap cabal-bootstrap-gen -- bootstrap/linux-8.10.7.plan.json | python3 -m json.tool | tee bootstrap/linux-8.10.7.json

# documentation
##############################################################################
Expand Down
1 change: 0 additions & 1 deletion bootstrap/linux-8.10.4.plan.json
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions bootstrap/linux-8.10.4.json → bootstrap/linux-8.10.7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
{
"source": "hackage",
"package": "th-compat",
"version": "0.1.2",
"version": "0.1.3",
"flags": [],
"cabal_sha256": "3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8",
"src_sha256": "2bc45d0199de3dc65ebc9b71251799f5238869dbc6a66bdf0c06c7e23d603801",
"cabal_sha256": "a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993",
"src_sha256": "6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6",
"revision": 0
},
{
Expand Down Expand Up @@ -181,9 +181,9 @@
"-old-bytestring",
"-old-time"
],
"cabal_sha256": "94ded05718fe75b88c98e7113feeb9fca50688a7e59b6aefd80a6f48438c5062",
"cabal_sha256": "d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d",
"src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
"revision": 3
"revision": 4
},
{
"source": "hackage",
Expand All @@ -194,9 +194,9 @@
"-non-blocking-ffi",
"-pkg-config"
],
"cabal_sha256": "28f4d460c260e074cab833625454564b9783a3389b7bb91fd54da2790b39592c",
"cabal_sha256": "262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4",
"src_sha256": "807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88",
"revision": 0
"revision": 1
},
{
"source": "hackage",
Expand Down Expand Up @@ -261,7 +261,7 @@
"builtin": [
{
"package": "rts",
"version": "1.0"
"version": "1.0.1"
},
{
"package": "ghc-prim",
Expand All @@ -273,7 +273,7 @@
},
{
"package": "base",
"version": "4.14.1.0"
"version": "4.14.3.0"
},
{
"package": "array",
Expand All @@ -289,7 +289,7 @@
},
{
"package": "containers",
"version": "0.6.2.1"
"version": "0.6.5.1"
},
{
"package": "binary",
Expand Down Expand Up @@ -321,7 +321,7 @@
},
{
"package": "ghc-boot-th",
"version": "8.10.4"
"version": "8.10.7"
},
{
"package": "pretty",
Expand All @@ -341,11 +341,11 @@
},
{
"package": "process",
"version": "1.6.9.0"
"version": "1.6.13.2"
},
{
"package": "stm",
"version": "2.5.0.0"
"version": "2.5.0.1"
}
]
}
1 change: 1 addition & 0 deletions bootstrap/linux-8.10.7.plan.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions bootstrap/linux-8.6.5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
{
"source": "hackage",
"package": "th-compat",
"version": "0.1.2",
"version": "0.1.3",
"flags": [],
"cabal_sha256": "3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8",
"src_sha256": "2bc45d0199de3dc65ebc9b71251799f5238869dbc6a66bdf0c06c7e23d603801",
"cabal_sha256": "a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993",
"src_sha256": "6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6",
"revision": 0
},
{
Expand Down Expand Up @@ -181,9 +181,9 @@
"-old-bytestring",
"-old-time"
],
"cabal_sha256": "94ded05718fe75b88c98e7113feeb9fca50688a7e59b6aefd80a6f48438c5062",
"cabal_sha256": "d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d",
"src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
"revision": 3
"revision": 4
},
{
"source": "hackage",
Expand All @@ -194,9 +194,9 @@
"-non-blocking-ffi",
"-pkg-config"
],
"cabal_sha256": "28f4d460c260e074cab833625454564b9783a3389b7bb91fd54da2790b39592c",
"cabal_sha256": "262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4",
"src_sha256": "807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88",
"revision": 0
"revision": 1
},
{
"source": "hackage",
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/linux-8.6.5.plan.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions bootstrap/linux-8.8.4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
{
"source": "hackage",
"package": "th-compat",
"version": "0.1.2",
"version": "0.1.3",
"flags": [],
"cabal_sha256": "3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8",
"src_sha256": "2bc45d0199de3dc65ebc9b71251799f5238869dbc6a66bdf0c06c7e23d603801",
"cabal_sha256": "a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993",
"src_sha256": "6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6",
"revision": 0
},
{
Expand Down Expand Up @@ -181,9 +181,9 @@
"-old-bytestring",
"-old-time"
],
"cabal_sha256": "94ded05718fe75b88c98e7113feeb9fca50688a7e59b6aefd80a6f48438c5062",
"cabal_sha256": "d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d",
"src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
"revision": 3
"revision": 4
},
{
"source": "hackage",
Expand All @@ -194,9 +194,9 @@
"-non-blocking-ffi",
"-pkg-config"
],
"cabal_sha256": "28f4d460c260e074cab833625454564b9783a3389b7bb91fd54da2790b39592c",
"cabal_sha256": "262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4",
"src_sha256": "807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88",
"revision": 0
"revision": 1
},
{
"source": "hackage",
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/linux-8.8.4.plan.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions templates/ci-bootstrap.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v2
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json

- name: Smoke test
run: |
Expand All @@ -40,17 +40,17 @@ jobs:
- name: Install GHC
run: |
cd $(mktemp -d)
curl -sLO "https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-apple-darwin.tar.xz"
curl -sLO "https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-apple-darwin.tar.xz"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

tar -xJf ghc-*.tar.xz
cd ghc-*
./configure --prefix=/opt/ghc/8.10.4
./configure --prefix=/opt/ghc/8.10.7
sudo make install
- uses: actions/checkout@v2

# We use linux dependencies
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.7/bin/ghc -d bootstrap/linux-8.10.7.json

- name: Smoke test
run: |
Expand Down