Merge pull request #134 from lovesegfault/composite-action

refactor: replace with a simpler composite action
cachix · Apr 10, 2022 · 451e611 · 451e611
2 parents 24e801e + 112054f
commit 451e611
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 3,797 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,8 +13,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
     - name: Install Nix
       uses: ./
       with:
@@ -24,16 +22,13 @@ jobs:
     # cachix should be available and be able to configure a cache
     - run: cachix use cachix
     - run: nix-build test.nix
-
   custom-nix-path:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
     - name: Install Nix
       uses: ./
       with:
@@ -48,8 +43,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
     - name: Install Nix
       uses: ./
       with:
@@ -66,8 +59,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
     - name: Install Nix
       uses: ./
       with:
@@ -84,8 +75,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
     - name: Install Nix
       uses: ./
       with:
@@ -101,8 +90,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
     - name: Install Nix
       uses: ./
       with:

diff --git a/action.yml b/action.yml
@@ -14,5 +14,12 @@ branding:
   color: 'blue'
   icon: 'sun'
 runs:
-  using: 'node12'
-  main: 'lib/main.js'
+  using: 'composite'
+  steps:
+    - run : ${{ github.action_path }}/install-nix.sh
+      shell: bash
+      env:
+        INPUT_INSTALL_URL: ${{ inputs.install_url }}
+        INPUT_INSTALL_OPTIONS: ${{ inputs.install_options }}
+        INPUT_NIX_PATH: ${{ inputs.nix_path }}
+        INPUT_EXTRA_NIX_CONFIG: ${{ inputs.extra_nix_config }}
diff --git a/lib/install-nix.sh → install-nix.sh b/lib/install-nix.sh → install-nix.sh
diff --git a/lib/README.md b/lib/README.md
diff --git a/lib/main.js b/lib/main.js
diff --git a/package.json b/package.json
diff --git a/shell.nix b/shell.nix
diff --git a/src/main.ts b/src/main.ts
diff --git a/tsconfig.json b/tsconfig.json