Skip to content

Commit

Permalink
Update GHC version in build
Browse files Browse the repository at this point in the history
  • Loading branch information
td202 committed Feb 8, 2024
1 parent 66f1ae9 commit a263c7e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:

env:
RUST: 1.68
GHC: 9.2.7
GHC: 9.6.4

jobs:
fourmolu:
Expand Down
2 changes: 1 addition & 1 deletion scripts/distributables/linux-concordium-client.Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pipeline {
agent any
environment {
GHC_VERSION = '9.2.7'
GHC_VERSION = '9.6.4'
VERSION = sh(
returnStdout: true,
script: '''\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk add perl g++ make protoc ncurses ncurses-dev zlib zlib-static zlib-dev g
ARG RUST_VERSION=1.68
RUN wget -qO - https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain ${RUST_VERSION} -y

ARG GHC_VERSION=9.2.7
ARG GHC_VERSION=9.6.4
RUN wget -q https://s3-eu-west-1.amazonaws.com/static-libraries.concordium.com/ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz && \
tar -xf ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz && \
cd ghc-${GHC_VERSION}-x86_64-unknown-linux && \
Expand All @@ -19,7 +19,7 @@ RUN wget -q https://s3-eu-west-1.amazonaws.com/static-libraries.concordium.com/g
cd .. && \
rm -rf ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz ghc-${GHC_VERSION}-x86_64-unknown-linux

ARG STACK_VERSION=2.9.1
ARG STACK_VERSION=2.13.1
RUN wget -q https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64.tar.gz && \
tar -xf stack-${STACK_VERSION}-linux-x86_64.tar.gz && \
mkdir -p $HOME/.stack/bin && \
Expand Down
2 changes: 1 addition & 1 deletion scripts/distributables/macos-concordium-client.Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pipeline {
agent { label 'jenkins-worker' }
environment {
GHC_VERSION = '9.2.7'
GHC_VERSION = '9.6.4'
RUST_VERSION = '1.68'
VERSION = sh(
returnStdout: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pipeline {
stages {
stage('build') {
environment {
GHC_VERSION = '9.2.7'
GHC_VERSION = '9.6.4'
BASE_OUTFILE = 's3://distribution.concordium.software/tools/windows/concordium-client'
}
steps {
Expand Down

0 comments on commit a263c7e

Please sign in to comment.