diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9760243..6c05314 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,3 @@ -# dependabot.yml file with -# customized npm configuration - version: 2 updates: # Keep npm dependencies up to date @@ -16,4 +13,3 @@ updates: labels: - "workflow" milestone: 1 - diff --git a/.github/workflows/on-push-to-master.yml b/.github/workflows/on-push-to-master.yml deleted file mode 100644 index 65f1097..0000000 --- a/.github/workflows/on-push-to-master.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: On Push to Master Workflows - -on: - push: - branches: - - "master" - -jobs: - continuous-integration: - name: "Npm Continuous Integration" - runs-on: ubuntu-latest - - steps: - - name: Checkout Repo - uses: actions/checkout@v2 - - - name: Install Node - uses: actions/setup-node@v1 - with: - node-version: 12 - - - name: NPM Install - run: npm install - - name: NPM Continous Integration - run: npm ci diff --git a/.github/workflows/pr-open-to-demos.yml b/.github/workflows/pr-open-to-demos-and-dependency-update.yml similarity index 85% rename from .github/workflows/pr-open-to-demos.yml rename to .github/workflows/pr-open-to-demos-and-dependency-update.yml index 7fee8bd..9688242 100644 --- a/.github/workflows/pr-open-to-demos.yml +++ b/.github/workflows/pr-open-to-demos-and-dependency-update.yml @@ -1,10 +1,11 @@ -name: PR Open To Demos Workflows +name: PR Open To Demos and Dependency Update Workflows on: pull_request: types: [ opened ] branches: - demo/* + - workflow/dependency-update jobs: reset-demo-from-develop: diff --git a/.github/workflows/pr-open-workflows.yml b/.github/workflows/pr-open-workflows.yml index 26f7082..fb92c50 100644 --- a/.github/workflows/pr-open-workflows.yml +++ b/.github/workflows/pr-open-workflows.yml @@ -36,3 +36,21 @@ jobs: uses: Code-Hex/auto-milestone-binder@v1.0.1 with: github-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} + + continuous-integration: + name: "Npm Continuous Integration" + runs-on: ubuntu-latest + + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + + - name: Install Node + uses: actions/setup-node@v1 + with: + node-version: 12 + + - name: NPM Install + run: npm install + - name: NPM Continous Integration + run: npm ci