diff --git a/.github/workflows/npm-gulp.yml b/.github/workflows/npm-gulp.yml index 33b3c80..00e3cd8 100644 --- a/.github/workflows/npm-gulp.yml +++ b/.github/workflows/npm-gulp.yml @@ -2,8 +2,6 @@ name: NodeJS with Gulp on: # Runs on pushes targeting the default branch - push: - branches: ["master"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -52,11 +50,9 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v4 - name: Install dependencies - run: npm install --quiet --no-progress --cache=.cache/npm + run: npm install --quiet --no-progress - name: Build run: | - node_modules/.bin/gulp - node_modules/.bin/gulp lint node_modules/.bin/gulp preview:build node_modules/.bin/gulp bundle:pack cp build/ui-bundle.zip ./public/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 70b6f28..28b671c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,10 @@ -name: NodeJS with Gulp - -on: pull_request +name: Testing +on: + pull_request: + branches: ["master"] + push: + branches: ["master"] jobs: test: runs-on: ubuntu-latest @@ -31,8 +34,7 @@ jobs: node-version: 20 cache: ${{ steps.detect-package-manager.outputs.manager }} - name: Install dependencies - run: npm install --quiet --no-progress --cache=.cache/npm + run: npm install --quiet --no-progress - name: Build run: | - node_modules/.bin/gulp node_modules/.bin/gulp lint diff --git a/gulp.d/tasks/build-preview-pages.js b/gulp.d/tasks/build-preview-pages.js index 7516e0d..5a7cc74 100644 --- a/gulp.d/tasks/build-preview-pages.js +++ b/gulp.d/tasks/build-preview-pages.js @@ -75,7 +75,7 @@ module.exports = (src, previewSrc, previewDest, sink = () => map()) => (done) => ) function loadSampleUiModel (src) { - return fs.readFile(ospath.join(src, 'ui-model.yml'), 'utf8').then((contents) => yaml.safeLoad(contents)) + return fs.readFile(ospath.join(src, 'ui-model.yml'), 'utf8').then((contents) => yaml.load(contents)) } function registerPartials (src) {