Skip to content

Commit

Permalink
Revert "Prevent GitHub Actions from being triggered twice (finos#2559)"
Browse files Browse the repository at this point in the history
This reverts commit b297b46.
  • Loading branch information
hugohills-regnosys committed Dec 1, 2023
1 parent ec7144c commit f1c31cb
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 38 deletions.
23 changes: 0 additions & 23 deletions .github/actions/maven-build/action.yml

This file was deleted.

9 changes: 7 additions & 2 deletions .github/workflows/cve-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/maven-build
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
run-tests: false
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn clean install -DskipTests
- name: CVE scanning
uses: dependency-check/[email protected]
env:
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/license-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ name: License Scanning for Maven
on:
workflow_dispatch:
push:
branches:
- master
paths:
- 'pom.xml'
- '.github/workflows/license-scanning.yml'
pull_request:
paths:
- 'pom.xml'
- '.github/workflows/license-scanning.yml'
Expand All @@ -25,11 +19,16 @@ jobs:
module-folder: ["./", "./examples", "./rosetta-source", "./rosetta-project", "./distribution"]
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
cache: maven
distribution: 'adopt'
- name: Install XQ
run: pip install xq
- uses: ./.github/actions/maven-build
with:
run-tests: false
- name: Build with Maven
run: mvn clean install -DskipTests
- name: License XML report
run: mvn org.codehaus.mojo:license-maven-plugin:2.0.0:download-licenses
- name: Validate XML report
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CDM Build on Windows machine

on:
workflow_dispatch:
pull_request:
on: [workflow_dispatch, push, pull_request]

jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/maven-build
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Maven install
run: mvn install

0 comments on commit f1c31cb

Please sign in to comment.