diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-02-07 13:23:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 13:23:19 +0300 |
| commit | 6d14ea10e7b40d761135a12403cddbd4a6a36304 (patch) | |
| tree | d4fb4a4ec314d6719ce144c99f8663941956f1c8 | |
| parent | 6d76aa7599e6ae85ec361be69a1424c07fe58b5a (diff) | |
| parent | 6c04c656565af014d24170998e1aa7d1e892afb1 (diff) | |
Merge pull request #181 from nextcloud/backport/180/stable18v18.0.1RC3v18.0.1RC2v18.0.1
[stable18] Use actions from tutorial
| -rw-r--r-- | .github/workflows/lint.yml | 34 | ||||
| -rw-r--r-- | .github/workflows/node.yml | 10 |
2 files changed, 26 insertions, 18 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ef949305..229fb498 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,33 +15,37 @@ jobs: matrix: php-versions: ['7.2', '7.3', '7.4'] - name: php${{ matrix.php-versions }} lint + name: php${{ matrix.php-versions }} steps: - - name: Checkout - uses: actions/checkout@master - - name: Set up php${{ matrix.php-versions }} - uses: shivammathur/setup-php@master - with: - php-version: ${{ matrix.php-versions }} - coverage: none - - name: Lint - run: composer run lint + - uses: actions/checkout@v2 + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + coverage: none + + - name: Lint + run: composer run lint node: runs-on: ubuntu-latest strategy: matrix: - node-version: [12.x] + node-versions: [12.x] - name: ESLint + name: node${{ matrix.node-versions }} steps: - uses: actions/checkout@v2 - - name: Use node ${{ matrix.node-version }} + + - name: Set up node ${{ matrix.node-versions }} uses: actions/setup-node@v1 with: - node-version: ${{ matrix.node-version }} + node-versions: ${{ matrix.node-versions }} + - name: Install dependencies run: npm ci - - name: ESLint + + - name: Lint run: npm run lint diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index df5c1166..d5c403df 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -13,18 +13,22 @@ jobs: strategy: matrix: - node-version: [12.x] + node-versions: [12.x] + name: node${{ matrix.node-versions }} steps: - uses: actions/checkout@v2 - - name: Use node ${{ matrix.node-version }} + + - name: Set up node ${{ matrix.node-versions }} uses: actions/setup-node@v1 with: - node-version: ${{ matrix.node-version }} + node-versions: ${{ matrix.node-versions }} + - name: Install dependencies & build run: | npm ci npm run build --if-present + - name: Check webpack build changes run: | bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )" |