Setup confer-head prereleases

.github/workflows/ci.yml

@@ -4,12 +4,12 @@ name: CI
 on:
   pull_request:
   push:
-    branches: ["main"]
+    branches: ['main']
 
 jobs:
   generate-matrix:
-    name: "Generate matrix from cabal"
-    outputs: 
+    name: 'Generate matrix from cabal'
+    outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     runs-on: ubuntu-latest
     steps:
@@ -18,8 +18,8 @@ jobs:
         uses: kleidukos/[email protected]
         with:
           cabal-file: confer.cabal
-          ubuntu-version: "latest"
-          macos: "macos-13"
+          ubuntu-version: 'latest'
+          macos: 'macos-13'
           version: 0.1.7.0
   tests:
     name: ${{ matrix.ghc }} on ${{ matrix.os }}
@@ -39,14 +39,114 @@ jobs:
       - name: Configure
         run: cabal configure --enable-tests
       - name: Freeze
-        run: cabal freeze
+        run: cabal freeze --project-file=cabal.release.project
       - name: Cache
         uses: actions/[email protected]
         with:
           path: ${{ steps.setup-haskell.outputs.cabal-store }}
           key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }}
           restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-
       - name: Build
-        run: cabal new-build
+        run: cabal build --project-file=cabal.release.project
       - name: Test
-        run: cabal new-test all
+        run: cabal test --project-file=cabal.release.project all
+      - name: Package the confer-head executable
+        run: |
+          CONFER_EXEC=$(cabal list-bin --project-file=cabal.release.project confer:exe:confer)
+          DIR=$(dirname $CONFER_EXEC)
+          FILE=$(basename $CONFER_EXEC)
+          CONFER_EXEC_TAR=confer-head-${{ runner.os }}-x86_64.tar.gz
+          tar -czvf $CONFER_EXEC_TAR -C $DIR $FILE
+          echo CONFER_EXEC_TAR=$CONFER_EXEC_TAR >> $GITHUB_ENV
+      - name: Upload the confer-head executable
+        uses: actions/upload-artifact@v3
+        with:
+          name: confer-${{ runner.os }}-x86_64
+          path: ${{ env.CONFER_EXEC_TAR }}
+
+  build-alpine:
+    name: Build statically linked using alpine
+    runs-on: ubuntu-latest
+    container: 'alpine:3.19'
+    needs: ['generate-matrix', 'tests']
+    strategy:
+      matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
+    steps:
+      - name: Install extra dependencies
+        shell: sh
+        run: |
+          apk add bash curl sudo jq pkgconfig \
+          zlib-dev zlib-static binutils-gold curl \
+          gcc g++ gmp-dev libc-dev libffi-dev make \
+          musl-dev ncurses-dev perl tar xz git
+
+      - uses: actions/checkout@v4
+
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: 'latest'
+
+      - name: Configure
+        run: cabal configure --enable-tests
+
+      - name: Freeze
+        run: cabal freeze --project-file=cabal.release.project
+
+      - uses: actions/cache@v4
+        with:
+          path: ${{ steps.setup-haskell.outputs.cabal-store }}
+          key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }}
+          restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-
+
+      - name: Enable statically linked executables
+        run: |
+          echo 'executable-static: true' >> cabal.release.project
+
+      - name: Build
+        run: cabal build --project-file=cabal.release.project
+
+      - name: Test
+        run: cabal test --project-file=cabal.release.project all
+
+      - name: Tar cabal head executable
+        run: |
+          CONFER_EXEC=$(cabal list-bin --project-file=cabal.release.project confer:exe:confer)
+          DIR=$(dirname $CONFER_EXEC)
+          FILE=$(basename $CONFER_EXEC)
+          CONFER_EXEC_TAR=confer-head-${{ runner.os }}-x86_64.tar.gz
+          tar -czvf $CONFER_EXEC_TAR -C $DIR $FILE
+          echo CONFER_EXEC_TAR=$CONFER_EXEC_TAR >> $GITHUB_ENV
+
+      - name: Upload confer executable to workflow artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: cabal-${{ runner.os }}-static-x86_64
+          path: ${{ env.CONFER_EXEC_TAR }}
+
+  prerelease-head:
+    name: Create a GitHub prerelease with the binary artifacts
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    needs: ['tests', 'build-alpine']
+
+    steps:
+    - uses: actions/download-artifact@v3
+      with:
+        name: confer-Linux-x86_64
+
+    - uses: actions/download-artifact@v3
+      with:
+        name: confer-Linux-static-x86_64
+
+    - name: Create GitHub prerelease
+      uses: marvinpinto/[email protected]
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        automatic_release_tag: confer-head
+        prerelease: true
+        title: confer-head
+        files: |
+          confer-head-Linux-x86_64.tar.gz
+          confer-head-Linux-static-x86_64.tar.gz

.github/workflows/linting.yml

@@ -5,18 +5,19 @@ on:
   push:
     branches: ["main"]
 
-# jobs:
-#   fourmolu:
-#     runs-on: ubuntu-latest
-#     steps:
-#     - uses: actions/checkout@v4
-#
-#     - uses: fourmolu/fourmolu-action@v10
-#       with:
-#         pattern: |
-#           src/**/*.hs
-#           test/**/*.hs
-#
+jobs:
+  fourmolu:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: fourmolu/fourmolu-action@v10
+      with:
+        pattern: |
+          app/**/*.hs
+          src/**/*.hs
+          test/**/*.hs
+
   hlint:
     runs-on: ubuntu-latest
     steps:
@@ -30,5 +31,5 @@ on:
     - name: 'Run HLint'
       uses: haskell-actions/hlint-run@v2
       with:
-        path: '["src/", "test/"]'
+        path: '["app/", "src/", "test/"]'
         fail-on: warning

.gitignore

@@ -3,3 +3,4 @@ tags
 tags.mtime
 .hpc
 *.tix
+*.local

Makefile

@@ -14,7 +14,7 @@ test: ## Run the test suite
 	@cabal test
 
 lint: ## Run the code linter (HLint)
-	@find test src -name "*.hs" | xargs -P $(PROCS) -I {} hlint --refactor-options="-i" --refactor {}
+	@find app test src -name "*.hs" | xargs -P $(PROCS) -I {} hlint --refactor-options="-i" --refactor {}
 
 style: ## Run the code styler (fourmolu and cabal-fmt)
 	@cabal-fmt -i *.cabal

app/Main.hs

@@ -1,8 +1,5 @@
-{-# LANGUAGE QuasiQuotes #-}
-
 module Main where
 
-import Control.Placeholder
 import Data.Function ((&))
 import Data.Map.Strict qualified as Map
 import Effectful
@@ -96,4 +93,4 @@ withInfo :: Parser a -> String -> ParserInfo a
 withInfo opts desc = info (helper <*> opts) $ progDesc desc
 
 osPathOption :: ReadM OsPath
-osPathOption = maybeReader (OsPath.encodeUtf)
+osPathOption = maybeReader OsPath.encodeUtf

cabal.project

@@ -8,8 +8,6 @@ test-show-details: direct
 
 documentation: True
 
-optimization: 2
-
 tests: True
 
 -- package confer

cabal.release.project

@@ -0,0 +1,14 @@
+import: cabal.project
+
+optimization: 2
+
+documentation: False
+
+flags: -development
+
+package *
+  ghc-options:
+    -flate-specialise -funbox-strict-fields
+    -finline-generics-aggressively -fexpose-all-unfoldings
+    -Wwarn=extended-warnings -fdicts-strict -fmax-worker-args=16
+    -fspec-constr-recursive=16 -funbox-strict-fields

confer.cabal

@@ -20,11 +20,6 @@ extra-doc-files:
 data-dir:        runtime/lua
 tested-with:     GHC ==9.8.2
 
-flag release
-  description: Compile the project for release
-  default:     False
-  manual:      True
-
 flag development
   description: Compile the project for development
   default:     True
@@ -54,14 +49,6 @@ common ghc-options
     -fhide-source-paths -Wno-unused-do-bind -fshow-hole-constraints
     -Wno-unticked-promoted-constructors
 
-  if flag(release)
-    ghc-options:
-      -flate-specialise -funbox-strict-fields
-      -finline-generics-aggressively -fexpose-all-unfoldings
-      -Werror=extended-warnings -fdicts-strict -fmax-worker-args=16
-      -fspec-constr-recursive=16 -funbox-strict-fields
-      -Wno-unused-packages -Werror=unused-imports
-
   if flag(development)
     ghc-options: -finfo-table-map -Wno-unused-imports -Wno-unused-packages
 

src/Confer/Effect/Symlink.hs

@@ -11,7 +11,6 @@
 
 import Control.Exception
 import Control.Monad
-import Control.Placeholder
 import Data.Map.Strict (Map)
 import Data.Map.Strict qualified as Map
 import Data.Text (Text)
@@ -19,12 +18,12 @@
 import Data.Text.Display
 import Effectful
 import Effectful.Dispatch.Dynamic
 import Effectful.Error.Static (Error)
 import Effectful.Error.Static qualified as Error
 import Effectful.FileSystem
 import Effectful.FileSystem qualified as FileSystem
 import Effectful.State.Static.Local qualified as State
 import System.Directory qualified as Directory
 import System.Directory.Internal (FileType (..), OsPath)
 import System.Directory.Internal qualified as Directory
 import System.IO.Error
@@ -80,7 +79,16 @@
         createFileLink sourcePath destinationPath
       Directory ->
         createDirectoryLink sourcePath destinationPath
-  DeleteSymlink _ -> todo
+  DeleteSymlink linkOsPath -> do
+    linkFilePath <- liftIO $ OsPath.decodeFS linkOsPath
+    sourceType <- liftIO $ do
+      metadata <- Directory.getFileMetadata linkOsPath
+      pure $ Directory.fileTypeFromMetadata metadata
+    case sourceType of
+      File ->
+        FileSystem.removeFile linkFilePath
+      Directory ->
+        FileSystem.removeDirectory linkFilePath
   TestSymlink linkOsPath expectedLinkTarget -> do
     linkFilepath <- liftIO $ OsPath.decodeFS linkOsPath
     liftIO $

test/Confer/CLI/Cmd/CheckTest.hs

@@ -87,5 +87,5 @@ testNonSymlink =
   Temporary.withSystemTempFile "confer-test.ext" $ \filepath _ -> do
     result <- Symlink.runSymlinkIO $ do
       osFilepath <- liftIO $ OsPath.encodeFS filepath
-      Symlink.testSymlink osFilepath ([osp| lol |])
+      Symlink.testSymlink osFilepath [osp| lol |]
     assertIsNotSymlink result