From d0920cb34dae8a4c56b5c96f91de6f7c851fd182 Mon Sep 17 00:00:00 2001
From: Timo Glastra <timo@animo.id>
Date: Fri, 26 May 2023 11:10:12 +0200
Subject: [PATCH] ci: simplify ci

Signed-off-by: Timo Glastra <timo@animo.id>
---
 .github/actions/test/action.yml              | 39 ------------------
 .github/actions/validate/action.yml          | 43 --------------------
 .github/workflows/continuous-integration.yml | 32 ++++++++-------
 3 files changed, 17 insertions(+), 97 deletions(-)
 delete mode 100644 .github/actions/test/action.yml
 delete mode 100644 .github/actions/validate/action.yml

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
deleted file mode 100644
index 342ff6c..0000000
--- a/.github/actions/test/action.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Test
-description: Test the code in the repository with `yarn test`
-author: 'Animo Solutions'
-
-inputs:
-  node-version:
-    description: Which Node.js version will be installed
-    required: true
-  uses-libindy:
-    description: Whether to also install libindy
-    required: false
-
-runs:
-  using: composite
-
-  steps:
-    # Setup the dependencies
-
-    # Sets up Libindy.
-    # If this is not required, remove the two lines below
-    - name: Setup Libindy
-      if: ${{ inputs.uses-libindy == 'true' }}
-      uses: ./.github/actions/setup-libindy
-
-    # Setup Node.js
-    - name: Setup Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ inputs.node-version }}
-
-    # Installing the project dependencies
-    - name: Install dependencies
-      shell: bash
-      run: yarn install
-
-    # Run the tests
-    - name: Run tests with coverage
-      shell: bash
-      run: yarn test --coverage
diff --git a/.github/actions/validate/action.yml b/.github/actions/validate/action.yml
deleted file mode 100644
index da384d4..0000000
--- a/.github/actions/validate/action.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Validate
-description: Validate the repository on style, type and lint checks as defined in the `yarn validate` script
-author: 'Animo Solutions'
-
-inputs:
-  node-version:
-    description: Which Node.js version will be installed
-    required: true
-  uses-libindy:
-    description: Whether to also install libindy
-    required: false
-
-runs:
-  using: composite
-  steps:
-    # Setup the dependencies
-
-    # Sets up Libindy.
-    # If this is not required, remove the two lines below
-    - name: Setup Libindy
-      if: ${{ inputs.uses-libindy == 'true' }}
-      uses: ./.github/actions/setup-libindy
-
-    # Setup Node.js
-    - name: Setup Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ inputs.node-version }}
-
-    # Installing the project dependencies
-    - name: Install dependencies
-      shell: bash
-      run: yarn install
-
-    # We need to build for validation (it checks the build types)
-    - name: Build
-      shell: bash
-      run: yarn build
-
-    # Validation
-    - name: Running `yarn validate`
-      shell: bash
-      run: yarn validate
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 5d88a5f..9603078 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -17,22 +17,24 @@ jobs:
       - name: Check the repository
         uses: actions/checkout@v2
 
-      - name: Validate
-        uses: ./.github/actions/validate
+      # Sets up Libindy.
+      - name: Setup Libindy
+        uses: ./.github/actions/setup-libindy
+
+      # Setup Node.js
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
         with:
           node-version: 16.x
-          uses-libindy: true
 
-  test:
-    name: Test
-    needs: validate
-    runs-on: ubuntu-20.04
+      # Installing the project dependencies
+      - name: Install dependencies
+        run: yarn install
 
-    steps:
-      - name: Check the repository
-        uses: actions/checkout@v2
-      - name: Test
-        uses: ./.github/actions/test
-        with:
-          node-version: 16.x
-          uses-libindy: true
+      # Validation
+      - name: Running `yarn validate`
+        run: yarn validate
+
+      # Run the tests
+      - name: Run tests with coverage
+        run: yarn test --coverage