diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 47290c8..0c01e86 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1,9 +1,9 @@ name: Merge checks -on: +on: pull_request: branches: - - master + - master-rtl jobs: build: @@ -11,8 +11,8 @@ jobs: strategy: matrix: - node-version: [12.x] - + node-version: [18.x] + steps: - uses: actions/checkout@v3 @@ -25,11 +25,11 @@ jobs: run: | npm install npm run build - + - name: Get version run: echo "::set-output name=version::v$(./ci/getVersion.sh)" id: version - name: Verify version run: | - ./ci/verifyVersion.sh ${{ steps.version.outputs.version }} \ No newline at end of file + ./ci/verifyVersion.sh ${{ steps.version.outputs.version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 952aa77..a417e36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: NodeJS with Webpack on: push: - branches: [ "master" ] + branches: [ "master-rtl" ] jobs: build: @@ -10,8 +10,8 @@ jobs: strategy: matrix: - node-version: [12.x] - + node-version: [18.x] + steps: - uses: actions/checkout@v3 @@ -27,7 +27,7 @@ jobs: zip -r -j static_minified.zip dist/* npm run release:unminified zip -r -j static_unminified.zip dist/* - + - name: Get version run: echo "::set-output name=version::v$(./ci/getVersion.sh)" id: version @@ -47,4 +47,4 @@ jobs: static_unminified.zip fail_on_unmatched_files: true prerelease: false - draft: false \ No newline at end of file + draft: false