Skip to content

Commit 7dadd5e

Browse files
authored
Merge pull request #4 from Totto16/update_things
chore: Update things
2 parents 98a6611 + 7db99d2 commit 7dadd5e

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
workflow_dispatch:
88

9+
env:
10+
oopetris_main_repo_ref: 01236ab59b27e7a8889e48c73ec0361cf2206805
11+
oopetris_c_repo_ref: 76814135f854a1124918dcc0fd34d36e316c4571
12+
913
jobs:
1014
build:
1115
name: ${{ matrix.config.name }}
@@ -41,7 +45,7 @@ jobs:
4145
with:
4246
fetch-depth: '0'
4347
repository: OpenBrickProtocolFoundation/oopetris
44-
ref: main
48+
ref: ${{ env.oopetris_main_repo_ref }}
4549
path: ./oopetris
4650
submodules: false
4751

@@ -50,7 +54,7 @@ jobs:
5054
with:
5155
fetch-depth: '0'
5256
repository: Totto16/oopetris_wrapper_c
53-
ref: main
57+
ref: ${{ env.oopetris_c_repo_ref }}
5458
path: ./oopetris_c_wrapper
5559
submodules: false
5660

@@ -59,7 +63,7 @@ jobs:
5963
uses: TheMrMilchmann/setup-msvc-dev@v3
6064
with:
6165
arch: x64
62-
toolset: 14.41
66+
toolset: 14.43
6367

6468
- name: Setup GCC (Linux)
6569
if: matrix.config.os == 'ubuntu'
@@ -136,7 +140,7 @@ jobs:
136140
137141
- uses: haskell-actions/setup@v2
138142
with:
139-
ghc-version: '9.6.6'
143+
ghc-version: '9.8.4'
140144
enable-stack: true
141145
stack-version: 'latest'
142146

app/Main.hs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ import System.Environment (getArgs)
66
main :: IO ()
77
main = do
88
args <- getArgs
9-
if length args /= 1
10-
then do
11-
putStrLn "Usage: <file>"
12-
else do
13-
let file = head args
9+
case args of
10+
[file] -> do
1411
isRecFile <- isRecordingFile file
1512
if not isRecFile
1613
then do
@@ -21,3 +18,4 @@ main = do
2118
RecordingReturnError err -> putStrLn $ "An error occurred: " ++ err
2219
RecordingReturnSuccess information -> print information
2320
return ()
21+
_ -> putStrLn "Usage: <file>"

oopetris-haskell-wrapper.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 0.1.0.0
99
description: Please see the README.md
1010
author: Totto16
1111
maintainer: Totto16
12-
copyright: 2024 Totto16
12+
copyright: 2024-2025 Totto16
1313
license: MIT
1414
license-file: LICENSE
1515
build-type: Simple

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: oopetris-haskell-wrapper
22
version: 0.1.0.0
33
license: MIT
44
author: "Totto16"
5-
copyright: "2024 Totto16"
5+
copyright: "2024-2025 Totto16"
66

77
extra-source-files:
88
- README.md

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# resolver: ./custom-snapshot.yaml
1919
# resolver: https://example.com/snapshots/2023-01-01.yaml
2020
resolver:
21-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml
21+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/16.yaml
2222

2323
# User packages to be built.
2424
# Various formats can be used as shown in the example below.

stack.yaml.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file was autogenerated by Stack.
22
# You should not edit this file by hand.
33
# For more information, please see the documentation at:
4-
# https://docs.haskellstack.org/en/stable/lock_files
4+
# https://docs.haskellstack.org/en/stable/topics/lock_files
55

66
packages:
77
- completed:
@@ -13,8 +13,8 @@ packages:
1313
hackage: c-storable-deriving-0.1.3
1414
snapshots:
1515
- completed:
16-
sha256: 521009bd88879b6993fab5ea5abe1ee2a539dfd8ec2dfc7c57017a8eaee1e78b
17-
size: 720262
18-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml
16+
sha256: 925e1bf884fd7a1ed2bfca9a041bed96fba51be6148cfa9fc4a590e218c2e483
17+
size: 683820
18+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/16.yaml
1919
original:
20-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml
20+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/16.yaml

0 commit comments

Comments
 (0)