diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4446caa..5d2fa93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,10 @@ on: pull_request: workflow_dispatch: +env: + oopetris_main_repo_ref: 01236ab59b27e7a8889e48c73ec0361cf2206805 + oopetris_c_repo_ref: 76814135f854a1124918dcc0fd34d36e316c4571 + jobs: build: name: ${{ matrix.config.name }} @@ -41,7 +45,7 @@ jobs: with: fetch-depth: '0' repository: OpenBrickProtocolFoundation/oopetris - ref: main + ref: ${{ env.oopetris_main_repo_ref }} path: ./oopetris submodules: false @@ -50,7 +54,7 @@ jobs: with: fetch-depth: '0' repository: Totto16/oopetris_wrapper_c - ref: main + ref: ${{ env.oopetris_c_repo_ref }} path: ./oopetris_c_wrapper submodules: false @@ -59,7 +63,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14.41 + toolset: 14.43 - name: Setup GCC (Linux) if: matrix.config.os == 'ubuntu' @@ -136,7 +140,7 @@ jobs: - uses: haskell-actions/setup@v2 with: - ghc-version: '9.6.6' + ghc-version: '9.8.4' enable-stack: true stack-version: 'latest' diff --git a/app/Main.hs b/app/Main.hs index 25814c7..f3b7a4d 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -6,11 +6,8 @@ import System.Environment (getArgs) main :: IO () main = do args <- getArgs - if length args /= 1 - then do - putStrLn "Usage: " - else do - let file = head args + case args of + [file] -> do isRecFile <- isRecordingFile file if not isRecFile then do @@ -21,3 +18,4 @@ main = do RecordingReturnError err -> putStrLn $ "An error occurred: " ++ err RecordingReturnSuccess information -> print information return () + _ -> putStrLn "Usage: " diff --git a/oopetris-haskell-wrapper.cabal b/oopetris-haskell-wrapper.cabal index 4da02ec..5aae16e 100644 --- a/oopetris-haskell-wrapper.cabal +++ b/oopetris-haskell-wrapper.cabal @@ -9,7 +9,7 @@ version: 0.1.0.0 description: Please see the README.md author: Totto16 maintainer: Totto16 -copyright: 2024 Totto16 +copyright: 2024-2025 Totto16 license: MIT license-file: LICENSE build-type: Simple diff --git a/package.yaml b/package.yaml index 94312ff..9181368 100644 --- a/package.yaml +++ b/package.yaml @@ -2,7 +2,7 @@ name: oopetris-haskell-wrapper version: 0.1.0.0 license: MIT author: "Totto16" -copyright: "2024 Totto16" +copyright: "2024-2025 Totto16" extra-source-files: - README.md diff --git a/stack.yaml b/stack.yaml index 811587a..93cf641 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2023-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/16.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml.lock b/stack.yaml.lock index 1f45bdb..91a59d8 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -1,7 +1,7 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files +# https://docs.haskellstack.org/en/stable/topics/lock_files packages: - completed: @@ -13,8 +13,8 @@ packages: hackage: c-storable-deriving-0.1.3 snapshots: - completed: - sha256: 521009bd88879b6993fab5ea5abe1ee2a539dfd8ec2dfc7c57017a8eaee1e78b - size: 720262 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml + sha256: 925e1bf884fd7a1ed2bfca9a041bed96fba51be6148cfa9fc4a590e218c2e483 + size: 683820 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/16.yaml original: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/16.yaml