fix: use fork of git-crypt to support ubuntu-24.04 runners (#167)

* fix: use fork

Signed-off-by: Markus Maga <[email protected]>

* fix: use newer version

Signed-off-by: Markus Maga <[email protected]>

* fix: update dist

Signed-off-by: Markus Maga <[email protected]>

* fix: wrong version tag

Signed-off-by: Markus Maga <[email protected]>

* fix: update dist??

Signed-off-by: Markus Maga <[email protected]>

* fix(husky): pre-commit hook that fixes dist

Signed-off-by: Markus Maga <[email protected]>

* fix: attempt

Signed-off-by: Markus Maga <[email protected]>

* fix

Signed-off-by: Markus Maga <[email protected]>

* fix

Signed-off-by: Markus Maga <[email protected]>

* fix

Signed-off-by: Markus Maga <[email protected]>

* fix: try chmod

Signed-off-by: Markus Maga <[email protected]>

* fix: fail on ubuntu20

Signed-off-by: Markus Maga <[email protected]>

* fix: one error message

Signed-off-by: Markus Maga <[email protected]>

* fix: stop testing ubuntu 20

Signed-off-by: Markus Maga <[email protected]>

* fix: update readme

Signed-off-by: Markus Maga <[email protected]>

* fix: update readme

Signed-off-by: Markus Maga <[email protected]>

---------

Signed-off-by: Markus Maga <[email protected]>

Author: Flydiverny

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        os: [ubuntu-latest, ubuntu-22.04, ubuntu-24.04]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.husky/pre-commit

@@ -1,5 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run package
+npm run all
 git add dist/

README.md

@@ -3,6 +3,16 @@
 This is a GitHub Action for setting up git-crypt in a GitHub Actions workflow. Git-crypt is a tool for encrypting and decrypting files in a Git repository.
 The action will download the source for the git-crypt CLI and build it in runtime, it may also be cached in the tools cache.
 
+**v4**:
+
+- works on ubuntu 22+
+- uses a fork of git-crypt https://github.com/maxisam/git-crypt/
+
+**v3**:
+
+- works on ubuntu 20 and 22
+- uses https://github.com/AGWA/git-crypt
+
 ## Pre-requisite for self-hosted runners
 
 This action requires openssl and openssl-devel to be installed on your runner (exists by default on github hosted runners).
@@ -23,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Flydiverny/setup-git-crypt@v3
+      - uses: flydiverny/setup-git-crypt@v4
 ```
 
 In this example, the `setup-git-crypt` action is added as a step in the `build` job, and it will be run when the workflow is triggered. The `setup-git-crypt` action will install and configure git-crypt in the environment where the action is running, allowing you to use git-crypt in the rest of your workflow.

action.yml

@@ -8,7 +8,7 @@ inputs:
   version:
     required: false
     description: 'git-crypt version'
-    default: '0.7.0'
+    default: '0.8.1'
 runs:
   using: 'node20'
   main: 'dist/index.js'

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "setup-git-crypt",
-  "version": "0.1.0",
+  "version": "4.0.0",
   "private": true,
   "description": "TypeScript template action",
   "main": "lib/main.js",
@@ -10,7 +10,8 @@
     "format-check": "prettier --check '**/*.ts'",
     "lint": "eslint src/**/*.ts",
     "package": "ncc build --source-map --license licenses.txt",
-    "all": "npm run build && npm run format && npm run lint && npm run package && echo"
+    "all": "npm run build && npm run format && npm run lint && npm run package && echo",
+    "prepare": "husky"
   },
   "repository": {
     "type": "git",
@@ -35,7 +36,7 @@
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.56.0",
     "eslint-plugin-github": "^4.10.1",
-    "husky": "^9.0.10",
+    "husky": "^9.1.7",
     "js-yaml": "^4.1.0",
     "prettier": "^3.2.4",
     "typescript": "^5.3.3"

dist/index.js.map

@@ -1,10 +1,18 @@
 import * as core from '@actions/core'
-import * as exec from '@actions/exec'
+// import * as exec from '@actions/exec'
 import * as tc from '@actions/tool-cache'
 import * as os from 'os'
 import * as path from 'path'
+import {chmod, copyFile, mkdir} from 'fs/promises'
 
 async function run(): Promise<void> {
+  if (process.env.ImageOS === 'ubuntu20') {
+    core.setFailed(
+      'Please use previous version of setup-git-crypt, this version requires ubuntu22 or higher'
+    )
+    process.exit(1)
+  }
+
   const version = core.getInput('version')
 
   try {
@@ -14,35 +22,19 @@ async function run(): Promise<void> {
     if (toolPath) {
       core.info(`Found in cache @ ${toolPath}`)
     } else {
-      const destination = path.join(os.homedir(), '.git-crypt')
+      const destination = path.join(os.homedir(), '.git-crypt/')
       core.info(`Install destination is ${destination}`)
 
       const downloaded = await tc.downloadTool(
-        `https://www.agwa.name/projects/git-crypt/downloads/git-crypt-${version}.tar.gz`
-      )
-      const extractedPath = await tc.extractTar(downloaded, destination)
-      const workspace = path.join(extractedPath, `git-crypt-${version}`)
-      core.info(`Extracted ${downloaded} to ${extractedPath}`)
-
-      let extraArgs: string[] = []
-
-      if (process.env.ImageOS === 'ubuntu22') {
-        extraArgs = [`CXXFLAGS='-DOPENSSL_API_COMPAT=0x30000000L'`]
-      }
-
-      await exec.getExecOutput(
-        'make',
-        ['install', `PREFIX=${extractedPath}`, ...extraArgs],
-        {
-          cwd: workspace
-        }
+        `https://github.com/maxisam/git-crypt/releases/download/${version}/git-crypt-${version}-linux-x86_64`
       )
 
-      toolPath = await tc.cacheDir(
-        path.join(destination, 'bin'),
-        'git-crypt',
-        version
-      )
+      await mkdir(destination, {recursive: true})
+      await chmod(downloaded, 0o755)
+
+      await copyFile(downloaded, path.join(destination, 'git-crypt'))
+
+      toolPath = await tc.cacheDir(destination, 'git-crypt', version)
     }
 
     core.addPath(toolPath)