Combine pre/main/post into single run entrypoint

DeLaGuardo · Aug 12, 2022 · 32b37e8 · 32b37e8
1 parent 3199aaa
commit 32b37e8
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 121 deletions.
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -13,15 +13,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install clojure tools-deps
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           tools-deps: 1.10.1.693
 
@@ -36,15 +38,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install Clojure CLI
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           cli: 1.10.1.693
 
@@ -59,15 +63,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install leiningen
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           lein: 2.9.1
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,15 +89,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '11'
 
       - name: Install boot
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           boot: 2.8.3
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -107,15 +115,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install babashka
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           bb: latest
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -131,15 +141,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install clj-kondo
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           clj-kondo: latest
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -155,15 +167,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install cljstyle
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           cljstyle: latest
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -180,15 +194,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install zprint
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           zprint: latest
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -200,15 +216,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
       - name: Prepare java
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Install all the tools
-        uses: DeLaGuardo/setup-clojure@main
-        # uses: ./
+        uses: ./
         with:
           cli: 1.11.1.1149
           lein: 2.9.1

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ jobs:
           java-version: '8'
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@9.3
+        uses: DeLaGuardo/setup-clojure@9.4
         with:
           # Install just one or all simultaneously
           # The value must indicate a particular version of the tool, or use 'latest'

diff --git a/__tests__/entrypoint.test.ts b/__tests__/entrypoint.test.ts
@@ -7,7 +7,7 @@ import * as _cljKondo from '../src/clj-kondo'
 import * as _cljstyle from '../src/cljstyle'
 import * as _zprint from '../src/zprint'
 import * as _utils from '../src/utils'
-import {run} from '../src/entrypoint'
+import {main} from '../src/entrypoint'
 
 jest.mock('@actions/core')
 const core: jest.Mocked<typeof _core> = _core as never
@@ -50,7 +50,7 @@ describe('setup-clojure', () => {
     inputs['lein'] = '1.2.3'
     inputs['github-token'] = 'abc'
 
-    await run()
+    await main()
 
     expect(lein.setup).toHaveBeenCalledWith('1.2.3', 'token abc')
   })
@@ -59,23 +59,23 @@ describe('setup-clojure', () => {
     inputs['boot'] = '1.2.3'
     inputs['github-token'] = 'abc'
 
-    await run()
+    await main()
 
     expect(boot.setup).toHaveBeenCalledWith('1.2.3', 'token abc')
   })
 
   it('sets up Clojure CLI tools from deprecated `tools-deps` option', async () => {
     inputs['tools-deps'] = '1.2.3'
 
-    await run()
+    await main()
 
     expect(cli.setup).toHaveBeenCalledWith('1.2.3')
   })
 
   it('sets up Clojure CLI tools', async () => {
     inputs['cli'] = '1.2.3'
 
-    await run()
+    await main()
 
     expect(cli.setup).toHaveBeenCalledWith('1.2.3')
   })
@@ -84,7 +84,7 @@ describe('setup-clojure', () => {
     inputs['bb'] = '1.2.3'
     inputs['github-token'] = 'abc'
 
-    await run()
+    await main()
 
     expect(bb.setup).toHaveBeenCalledWith('1.2.3', 'token abc')
   })
@@ -93,7 +93,7 @@ describe('setup-clojure', () => {
     inputs['clj-kondo'] = '1.2.3'
     inputs['github-token'] = 'abc'
 
-    await run()
+    await main()
 
     expect(cljKondo.setup).toHaveBeenCalledWith('1.2.3', 'token abc')
   })
@@ -102,7 +102,7 @@ describe('setup-clojure', () => {
     inputs['cljstyle'] = '1.2.3'
     inputs['github-token'] = 'abc'
 
-    await run()
+    await main()
 
     expect(cljstyle.setup).toHaveBeenCalledWith('1.2.3', 'token abc')
   })
@@ -112,15 +112,15 @@ describe('setup-clojure', () => {
     inputs['github-token'] = 'abc'
     utils.isWindows.mockReturnValue(true)
 
-    await run()
+    await main()
 
     expect(core.setFailed).toHaveBeenCalledWith(
       'cljstyle on windows is not supported yet.'
     )
   })
 
   it('throws if none of Clojure tools is specified', async () => {
-    await run()
+    await main()
     expect(core.setFailed).toHaveBeenCalledWith(
       'You must specify at least one clojure tool.'
     )
@@ -130,15 +130,15 @@ describe('setup-clojure', () => {
     inputs['bb'] = '1.2.3'
     bb.setup.mockRejectedValueOnce('Unknown failure')
 
-    await run()
+    await main()
     expect(core.setFailed).toHaveBeenCalledWith('Unknown failure')
   })
 
   it('sets up zprint', async () => {
     inputs['zprint'] = '1.2.3'
     inputs['github-token'] = 'abc'
 
-    await run()
+    await main()
 
     expect(zprint.setup).toHaveBeenCalledWith('1.2.3', 'token abc')
   })

diff --git a/action.yml b/action.yml
@@ -44,5 +44,3 @@ inputs:
 runs:
   using: 'node16'
   main: 'dist/index.js'
-  pre: 'dist/index.js'
-  post: 'dist/index.js'