Skip to content

Prepare release 2.6.0.0 #3959

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 7 commits into from
Jan 15, 2024
Merged

Prepare release 2.6.0.0 #3959

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a82ebd5
Prepare release 2.6.0.0
wz1000 Jan 15, 2024
42ea621
Revert "oops"
wz1000 Jan 15, 2024
a178f43
Revert "Bump both upload and download artifact"
wz1000 Jan 15, 2024
6e0b342
Revert "Bump geekyeggo/delete-artifact from 2 to 4 (#3921)"
wz1000 Jan 15, 2024
7756ff5
hls-semantic-tokens: add base bound
wz1000 Jan 15, 2024
f7c1d73
Update ChangeLog.md
wz1000 Jan 15, 2024
7bef3a8
Update ghc version support docs
wz1000 Jan 15, 2024
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
40 changes: 28 additions & 12 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ build_task:
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
CABAL_CACHE_NONFATAL: "yes"
matrix:
- name: build-ghc-9.2.5
- name: build-ghc-9.2.8
env:
GHC_VERSION: 9.2.5
- name: build-ghc-9.2.7
GHC_VERSION: 9.2.8
- name: build-ghc-9.4.8
env:
GHC_VERSION: 9.2.7
GHC_VERSION: 9.4.8
- name: build-ghc-9.6.4
env:
GHC_VERSION: 9.6.4
- name: build-ghc-9.8.1
env:
GHC_VERSION: 9.8.1
install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv
script:
- tzsetup Etc/GMT
Expand All @@ -40,8 +46,10 @@ build_task:
bindist_task:
name: bindist
depends_on:
- build-ghc-9.2.5
- build-ghc-9.2.7
- build-ghc-9.2.8
- build-ghc-9.4.8
- build-ghc-9.6.4
- build-ghc-9.8.1
timeout_in: 120m
only_if: $CIRRUS_TAG != ''
env:
Expand All @@ -56,13 +64,21 @@ bindist_task:
- tzsetup Etc/GMT
- adjkerntz -a

- curl -o binaries-9.2.5.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.2.5/binaries/out.tar.xz
- tar xvf binaries-9.2.5.tar.xz
- rm -f binaries-9.2.5.tar.xz
- curl -o binaries-9.2.8.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.2.8/binaries/out.tar.xz
- tar xvf binaries-9.2.8.tar.xz
- rm -f binaries-9.2.8.tar.xz

- curl -o binaries-9.4.8.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.4.8/binaries/out.tar.xz
- tar xvf binaries-9.4.8.tar.xz
- rm -f binaries-9.4.8.tar.xz

- curl -o binaries-9.6.4.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.6.4/binaries/out.tar.xz
- tar xvf binaries-9.6.4.tar.xz
- rm -f binaries-9.6.4.tar.xz

- curl -o binaries-9.2.7.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.2.7/binaries/out.tar.xz
- tar xvf binaries-9.2.7.tar.xz
- rm -f binaries-9.2.7.tar.xz
- curl -o binaries-9.8.1.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.8.1/binaries/out.tar.xz
- tar xvf binaries-9.8.1.tar.xz
- rm -f binaries-9.8.1.tar.xz

- bash .github/scripts/bindist.sh
bindist_artifacts:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ jobs:
tar -czf cabal.tar.gz *

- name: Upload workspace
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: workspace-${{ matrix.ghc }}-${{ matrix.os }}
retention-days: 1
path: workspace.tar.gz

- name: Upload .cabal
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: cabal-home-${{ matrix.ghc }}-${{ matrix.os }}
retention-days: 1
Expand All @@ -128,13 +128,13 @@ jobs:
enable-stack: false

- name: Download cabal home
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: cabal-home-${{ matrix.ghc }}-${{ matrix.os }}
path: .

- name: Download workspace
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: workspace-${{ matrix.ghc }}-${{ matrix.os }}
path: .
Expand All @@ -156,7 +156,7 @@ jobs:
run: find bench-results -name "*.csv" -or -name "*.svg" -or -name "*.html" | xargs tar -czf benchmark-artifacts.tar.gz

- name: Archive benchmarking artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: bench-results-${{ matrix.example }}-${{ runner.os }}-${{ matrix.ghc }}
path: benchmark-artifacts.tar.gz
Expand All @@ -166,7 +166,7 @@ jobs:
run: find bench-results -name "*.log" -or -name "*.hp" | xargs tar -czf benchmark-logs.tar.gz

- name: Archive benchmark logs
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: bench-logs-${{ matrix.example }}-${{ runner.os }}-${{ matrix.ghc }}
path: benchmark-logs.tar.gz
Expand Down
56 changes: 28 additions & 28 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8"]
ghc: ["9.8.1", "9.6.4", "9.4.8", "9.2.8"]
platform: [ { image: "debian:9"
, installCmd: "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install -y"
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
, ARTIFACT: "x86_64-linux-unknown"
, ADD_CABAL_ARGS: "--enable-split-sections"
}
- ghc: 9.6.3
- ghc: 9.6.4
platform:
{ image: "rockylinux:8"
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:

- if: always()
name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
retention-days: 2
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
strategy:
fail-fast: true
matrix:
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8" ]
ghc: ["9.8.1", "9.6.4", "9.4.8", "9.2.8" ]
steps:
- uses: docker://arm64v8/ubuntu:focal
name: Cleanup (aarch64 linux)
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:

- if: always()
name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
retention-days: 2
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8"]
ghc: ["9.8.1", "9.6.4", "9.4.8", "9.2.8"]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -288,7 +288,7 @@ jobs:

- if: always()
name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
retention-days: 2
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8"]
ghc: ["9.8.1", "9.6.4", "9.4.8", "9.2.8"]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -335,7 +335,7 @@ jobs:

- if: always()
name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
retention-days: 2
Expand Down Expand Up @@ -363,7 +363,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8"]
ghc: ["9.8.1", "9.6.4", "9.4.8", "9.2.8"]
steps:
- name: install windows deps
shell: pwsh
Expand All @@ -388,7 +388,7 @@ jobs:

- if: always()
name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
retention-days: 2
Expand Down Expand Up @@ -485,7 +485,7 @@ jobs:

- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: artifacts-${{ matrix.ARTIFACT }}
path: ./
Expand All @@ -502,15 +502,15 @@ jobs:
ARTIFACT: ${{ matrix.ARTIFACT }}

- name: Upload bindist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
name: bindists-${{ matrix.ARTIFACT }}
path: |
./out/*.tar.xz
./out/plan.json/*

- uses: geekyeggo/delete-artifact@v4
- uses: geekyeggo/delete-artifact@v2
with:
name: artifacts-${{ matrix.ARTIFACT }}

Expand All @@ -537,7 +537,7 @@ jobs:

- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: artifacts-arm
path: ./
Expand All @@ -553,15 +553,15 @@ jobs:
args: bash .github/scripts/bindist.sh

- name: Upload bindist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
name: bindists-arm
path: |
./out/*.tar.xz
./out/plan.json/*

- uses: geekyeggo/delete-artifact@v4
- uses: geekyeggo/delete-artifact@v2
with:
name: artifacts-arm

Expand All @@ -576,7 +576,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: artifacts-mac-x86_64
path: ./
Expand All @@ -591,15 +591,15 @@ jobs:
bash .github/scripts/bindist.sh

- name: Upload bindist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
name: bindists-mac-x86_64
path: |
./out/*.tar.xz
./out/plan.json/*

- uses: geekyeggo/delete-artifact@v4
- uses: geekyeggo/delete-artifact@v2
with:
name: artifacts-mac-x86_64

Expand All @@ -614,7 +614,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: artifacts-mac-aarch64
path: ./
Expand All @@ -635,15 +635,15 @@ jobs:
bash .github/scripts/bindist.sh

- name: Upload bindist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
name: bindists-mac-aarch64
path: |
./out/*.tar.xz
./out/plan.json/*

- uses: geekyeggo/delete-artifact@v4
- uses: geekyeggo/delete-artifact@v2
with:
name: artifacts-mac-aarch64

Expand All @@ -666,7 +666,7 @@ jobs:

- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: artifacts-win
path: ./out
Expand All @@ -679,15 +679,15 @@ jobs:
shell: pwsh

- name: Upload bindist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
name: bindists-win
path: |
./out/*.zip
./out/plan.json/*

- uses: geekyeggo/delete-artifact@v4
- uses: geekyeggo/delete-artifact@v2
with:
name: artifacts-win

Expand Down Expand Up @@ -780,7 +780,7 @@ jobs:

- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: bindists-${{ matrix.ARTIFACT }}
path: ./out
Expand Down Expand Up @@ -816,7 +816,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: bindists-arm
path: ./out
Expand Down
Loading