Skip to content

Commit

Permalink
chore: ensure the make command is always available (#586)
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
  • Loading branch information
nathanklick authored Nov 24, 2023
1 parent 198df52 commit f2e2449
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions .github/workflows/zxc-compile-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,23 @@ jobs:
# the fetch depth defaults to only the commit that triggered the workflow unless the spotless check was enabled
fetch-depth: ${{ inputs.enable-spotless-check && '0' || '' }}

- name: Setup Make
run: |
if ! command -v make >/dev/null 2>&1; then
sudo apt-get update
sudo apt-get install -y make
fi
- name: Setup Java
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
if: ${{ !inputs.enable-nodejs-tests && !cancelled() && !failure() }}
with:
distribution: ${{ inputs.java-distribution }}
java-version: ${{ inputs.java-version }}

- name: Setup Gradle
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
if: ${{ !inputs.enable-nodejs-tests && !cancelled() && !failure() }}
with:
gradle-version: ${{ inputs.gradle-version }}

Expand Down Expand Up @@ -148,7 +157,7 @@ jobs:
working-directory: fullstack-network-manager
if: ${{ inputs.enable-nodejs-tests && !cancelled() && !failure() }}
run: |
npm i
npm i
npm test
- name: NodeJS CLI E2E Tests
Expand All @@ -157,13 +166,13 @@ jobs:
if: ${{ inputs.enable-nodejs-tests && !cancelled() && !failure() }}
run: |
export DEV_MODE=true
npm i
npm i
npm link
fsnetman init -d ../charts
fsnetman cluster create
fsnetman cluster setup
fsnetman chart install
npm run test-e2e
npm run test-e2e
# This step tests the Helm chart direct mode of operation which uses the ubi8-init-java17 image.
- name: Helm Chart Test (Direct Install)
Expand All @@ -180,15 +189,15 @@ jobs:
- name: Compile
id: gradle-build
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
if: ${{ inputs.enable-unit-tests && !cancelled() && !failure() }}
if: ${{ !inputs.enable-nodejs-tests && !cancelled() && !failure() }}
with:
gradle-version: ${{ inputs.gradle-version }}
arguments: assemble --scan

- name: Examples Compile
id: gradle-build-examples
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
if: ${{ inputs.enable-unit-tests && !cancelled() && !failure() }}
if: ${{ !inputs.enable-nodejs-tests && !cancelled() && !failure() }}
with:
gradle-version: ${{ inputs.gradle-version }}
arguments: assemble --scan
Expand All @@ -197,7 +206,7 @@ jobs:
- name: Gradle Plugin Compile
id: gradle-build-gradle-plugin
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
if: ${{ inputs.enable-unit-tests && !cancelled() && !failure() }}
if: ${{ !inputs.enable-nodejs-tests && !cancelled() && !failure() }}
with:
gradle-version: ${{ inputs.gradle-version }}
arguments: assemble --scan
Expand Down

0 comments on commit f2e2449

Please sign in to comment.