Skip to content
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.

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

Update stackage resolver to LTS 21.6 #2275

Merged
merged 9 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG VARIANT="ubuntu-22.04"
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
ENV DEBIAN_FRONTEND=noninteractive
ENV BOOTSTRAP_HASKELL_NONINTERACTIVE=1
ENV BOOTSTRAP_HASKELL_GHC_VERSION=9.2.7
ENV BOOTSTRAP_HASKELL_GHC_VERSION=9.4.5
ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.10.1.0
ENV BOOTSTRAP_HASKELL_STACK_VERSION=2.9.3
ENV BOOTSTRAP_HASKELL_STACK_VERSION=2.11.1
ENV BOOTSTRAP_HASKELL_INSTALL_STACK=1
ENV BOOTSTRAP_HASKELL_INSTALL_HLS=1

Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/linux-static-binary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ on:
required: true
default: "main"

env:
STACK_VERSION: 2.11.1

jobs:
build:
name: Build static binary
runs-on: ubuntu-latest
container: ghcr.io/paulcadman/ghc-alpine:9.2.7
container: glcr.b-data.ch/ghc/ghc-musl:9.4.5
steps:
- name: checkout code
uses: actions/checkout@v3
Expand All @@ -28,14 +31,23 @@ jobs:
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
shell: bash

- name: install stack
run: |
curl https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64-static.tar.gz -OL
tar xf stack-STACK_VERSION-linux-x86_64-static.tar.gz
cp stack-STACK_VERSION-linux-x86_64-static/stack /usr/local/bin

- name: Stack permissions bug workaround
run: "chown -R $(id -un):$(id -gn) ~"

- name: Install clang14
run: apk add --update clang14

- name: Runtime build
run: make runtime
run: make runtime LIBTOOL=llvm14-ar

- name: build Juvix
run: stack install --allow-different-user --system-ghc --ghc-options='-split-sections -optl-static'
run: stack install --allow-different-user --system-ghc --ghc-options='-split-sections' --flag juvix:static

- run: echo "HOME=$HOME" >> $GITHUB_ENV
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion app/Commands/Init.hs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ getVersion :: forall r. (Members '[Embed IO] r) => Sem r SemVer
getVersion = do
txt <- embed getLine
if
| Text.null txt -> return mempty
| Text.null txt -> return defaultVersion
| otherwise -> case parse semver' txt of
Right r -> return r
Left err -> do
Expand Down
27 changes: 12 additions & 15 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
with-compiler: ghc-9.2.7
-- Generated by stack2cabal

with-compiler: ghc-9.4.5

packages:
./

jobs: $ncpus
source-repository-package
type: git
location: https://github.com/janmasrovira/haskeline.git
tag: 81e393e156508a20fcc197acc945b0f44aa4f82b

source-repository-package
type: git
location: https://github.com/janmasrovira/repline.git
tag: a735ab1459db408adda080eb5ea21b96fb4a6011

allow-older: *
allow-newer: *

import: https://www.stackage.org/lts-20.21/cabal.config

package juvix
ghc-options: -optP-Wno-nonportable-include-path
test-show-details: direct

source-repository-package
type: git
location: https://github.com/janmasrovira/repline.git
tag: a735ab1459db408adda080eb5ea21b96fb4a6011

source-repository-package
type: git
location: https://github.com/janmasrovira/haskeline.git
tag: 81e393e156508a20fcc197acc945b0f44aa4f82b
Loading
Loading