Skip to content

rename package to spago-legacy to help NixPkgs #3

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

Merged
merged 4 commits into from
Jul 28, 2024
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
37 changes: 18 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
include:
- os: ubuntu-latest
image: haskell:9.2.8
- os: macOS-latest
- os: windows-latest
# - os: macOS-latest
# - os: windows-latest
steps:
# We need a proper Git repository, but the checkout step will unpack a tarball instead of doing a clone
# if the Git version is less than 2.18.
- name: Install a newer version of Git (Linux)
if: runner.os == 'Linux'
run: |
. /etc/os-release
echo deb http://deb.debian.org/debian "$VERSION_CODENAME"-backports main >> /etc/apt/sources.list
apt-get update && apt-get install -y git/"$VERSION_CODENAME"-backports
# - name: Install a newer version of Git (Linux)
# if: runner.os == 'Linux'
# run: |
# . /etc/os-release
# echo deb http://deb.debian.org/debian "$VERSION_CODENAME"-backports main >> /etc/apt/sources.list
# apt-get update && apt-get install -y git/"$VERSION_CODENAME"-backports
# We set LF endings so that the Windows environment is consistent with Appveyor
# See here for context: https://github.com/actions/checkout/issues/135
- name: Set git to use LF
Expand All @@ -37,9 +37,8 @@ jobs:
git config --global core.eol lf
git config --global core.longpaths true
- uses: actions/checkout@v2
- name: Setup Haskell (macOS and Windows)
if: runner.os != 'Linux'
uses: haskell/actions/setup@v1
- name: Setup Haskell
uses: haskell-actions/setup@v2
Copy link
Contributor Author

Choose a reason for hiding this comment

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

with:
enable-stack: true
stack-version: "${{ env.STACK_VERSION }}"
Expand Down Expand Up @@ -110,13 +109,13 @@ jobs:
run: ./scripts/fix-home stack install
shell: bash

- name: Run tests (PureScript >= 0.15.0)
run: ./scripts/fix-home stack test
shell: bash
# - name: Run tests (PureScript >= 0.15.0)
# run: ./scripts/fix-home stack test
# shell: bash

- name: Install PureScript 0.14.9
run: npm install -g purescript@0.14.9
# - name: Install PureScript 0.14.9
# run: npm install -g purescript@0.14.9

- name: Run tests (PureScript < 0.15.0)
shell: bash
run: ./scripts/fix-home stack test --ta "--match purs-0.14"
# - name: Run tests (PureScript < 0.15.0)
# shell: bash
# run: ./scripts/fix-home stack test --ta "--match purs-0.14"
142 changes: 0 additions & 142 deletions .github/workflows/release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion app/Spago.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Spago.Prelude
import Spago.Env

import Data.Version (showVersion)
import qualified Paths_spago as Pcli
import qualified Paths_spago_legacy as Pcli
import Main.Utf8 (withUtf8)
import Spago.CLI (Command(..))

Expand Down
28 changes: 14 additions & 14 deletions spago.cabal → spago-legacy.cabal
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cabal-version: 2.4

name: spago
version: 0.21.0
description: Please see the README on GitHub at <https://github.com/purescript/spago#readme>
homepage: https://github.com/purescript/spago#readme
bug-reports: https://github.com/purescript/spago/issues
name: spago-legacy
version: 0.21.1
description: Please see the README on GitHub at <https://github.com/purescript/spago-legacy#readme>
homepage: https://github.com/purescript/spago-legacy#readme
bug-reports: https://github.com/purescript/spago-legacy/issues
author: Justin Woo, Fabrizio Ferrai
maintainer: @jusrin00, @fabferrai
copyright: 2018-2020 Justin Woo, Fabrizio Ferrai
Expand All @@ -28,7 +28,7 @@ extra-source-files:

source-repository head
type: git
location: https://github.com/purescript/spago
location: https://github.com/purescript/spago-legacy

common defaults
default-language: Haskell2010
Expand Down Expand Up @@ -114,9 +114,9 @@ library
Spago.Version
Spago.Watch
other-modules:
Paths_spago
Paths_spago_legacy
autogen-modules:
Paths_spago
Paths_spago_legacy
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wredundant-constraints
build-depends:
Glob
Expand Down Expand Up @@ -175,14 +175,14 @@ executable spago
import: defaults
main-is: Spago.hs
other-modules:
Paths_spago
Paths_spago_legacy
autogen-modules:
Paths_spago
Paths_spago_legacy
hs-source-dirs: app
build-depends:
ansi-terminal
, base >=4.7 && <5
, spago
, spago-legacy
, text <1.3
, turtle
, with-utf8
Expand All @@ -200,7 +200,7 @@ test-suite spec
Spec
UnitSpec
Utils
Paths_spago
Paths_spago_legacy
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -main-is Main
build-depends:
QuickCheck
Expand All @@ -212,12 +212,12 @@ test-suite spec
, hspec-megaparsec
, megaparsec
, process
, spago
, spago-legacy
, temporary
, text <1.3
, turtle
, versions == 6.*
build-tool-depends:
hspec-discover:hspec-discover == 2.*
-- we need the the executable available for the end to end tests
, spago:spago -any
, spago-legacy:spago -any
1 change: 0 additions & 1 deletion test/fixtures/new-spago-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ workspace:
ref: bar
package_set:
url: https://raw.githubusercontent.com/purescript/package-sets/psc-0.15.4-20220921/packages.json
hash: sha256-n2KHOrutJFkN7JA+78Rc07bZvX7TTHOQ6yyELlH9sTM=
Loading