Skip to content
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
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -41,7 +45,7 @@ jobs:
with:
fetch-depth: '0'
repository: OpenBrickProtocolFoundation/oopetris
ref: main
ref: ${{ env.oopetris_main_repo_ref }}
path: ./oopetris
submodules: false

Expand All @@ -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

Expand All @@ -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'
Expand Down Expand Up @@ -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'

Expand Down
8 changes: 3 additions & 5 deletions app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ import System.Environment (getArgs)
main :: IO ()
main = do
args <- getArgs
if length args /= 1
then do
putStrLn "Usage: <file>"
else do
let file = head args
case args of
[file] -> do
isRecFile <- isRecordingFile file
if not isRecFile
then do
Expand All @@ -21,3 +18,4 @@ main = do
RecordingReturnError err -> putStrLn $ "An error occurred: " ++ err
RecordingReturnSuccess information -> print information
return ()
_ -> putStrLn "Usage: <file>"
2 changes: 1 addition & 1 deletion oopetris-haskell-wrapper.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Loading