ci

ZHaskell · May 23, 2024 · 321101a · 321101a
1 parent 8649905
commit 321101a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,7 +17,8 @@ jobs:
         # TODO:
         # zk_server: ["3.4.14", "3.6.2"]
         # zk_client: ["3.4.14", "3.6.2"]
-        os: [ubuntu-latest, macOS-latest]
+        #os: [ubuntu-latest, macOS-latest]
+        os: [macOS-latest]
 
     name: ghc-${{ matrix.ghc }} cabal-${{matrix.cabal}} on ${{ matrix.os }}
 
@@ -54,19 +55,19 @@ jobs:
           if [ "$(uname -m)" == "arm64" ]; then
             sed -i'.bak' -e "s/^clientPort=2181$/clientPort=2182/g" /opt/homebrew/etc/zookeeper/zoo.cfg
             cat /opt/homebrew/etc/zookeeper/zoo.cfg
-            echo "BUILD_ARGS=--extra-include-dirs=/opt/homebrew/include --extra-lib-dirs=/opt/homebrew/lib" >> $GITHUB_ENV
+            # echo "BUILD_ARGS=--extra-include-dirs=/opt/homebrew/include --extra-lib-dirs=/opt/homebrew/lib" >> $GITHUB_ENV
           else
             sed -i'.bak' -e "s/^clientPort=2181$/clientPort=2182/g" /usr/local/etc/zookeeper/zoo.cfg
             cat /usr/local/etc/zookeeper/zoo.cfg
           fi
           zkServer start
 
-      - name: remove xcode devtools on osx
-        if: runner.os == 'macOS'
-        run: sudo rm -rf /Library/Developer/CommandLineTools/SDKs
+      #- name: remove xcode devtools on osx
+      #  if: runner.os == 'macOS'
+      #  run: sudo rm -rf /Library/Developer/CommandLineTools/SDKs
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: ${{ matrix.cabal }}
@@ -81,11 +82,19 @@ jobs:
           rm -rf $GITHUB_WORKSPACE/*
           find $HOME/sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE -xzvf {} --strip 1 \;
 
+      - name: xxx
+        if: runner.os == 'macOS'
+        run: |
+          type clang
+          type opt
+          clang --version
+
+
       - name: build
         run: cabal build ${{ env.BUILD_ARGS }} --upgrade-dependencies --enable-tests --enable-benchmarks
 
       - name: test
-        run: cabal test ${{ env.BUILD_ARGS }} --test-show-details=always
+        run: cabal test --enable-tests ${{ env.BUILD_ARGS }} --test-show-details=always
 
       - name: check
         run: cabal check

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         with:
           # can't build docs on ghc-9.2 with cabal-3.8, see
           # - https://github.com/haskell/cabal/issues/8104