Skip to content

Commit

Permalink
Merge pull request #355 from neoxia/dependabot/npm_and_yarn/minimatch…
Browse files Browse the repository at this point in the history
…-9.0.0

build(deps): bump minimatch from 5.1.0 to 9.0.0
  • Loading branch information
julien-capellari authored Apr 27, 2023
2 parents 8cc3396 + 3a9ace6 commit 9011529
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 63 deletions.
53 changes: 10 additions & 43 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ jobs:
- name: Test
run: yarn test

build:
check-build:
runs-on: ubuntu-latest
needs: [unit-tests]

steps:
- uses: actions/checkout@v3.5.2
Expand All @@ -53,9 +52,17 @@ jobs:
name: bundle
path: dist

- name: Check build
run: |
if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
echo "Detected uncommitted changes after build. See status below:"
git diff
exit 1
fi
action-tests:
runs-on: ubuntu-latest
needs: [build]
needs: [check-build]

strategy:
matrix:
Expand Down Expand Up @@ -100,12 +107,6 @@ jobs:
steps:
- uses: actions/checkout@v3.5.2

- name: Download build artifacts
uses: actions/download-artifact@v3
with:
name: bundle
path: dist

- name: Checkout test repository
uses: actions/checkout@v3.5.2
with:
Expand Down Expand Up @@ -133,37 +134,3 @@ jobs:
run: |
echo "::error::Test failed: workspace ${{ matrix.workspace }} should not be affected"
exit 1
deploy:
if: github.event_name == 'push'
runs-on: ubuntu-latest
needs: [action-tests]
environment: master

permissions:
contents: write

steps:
- uses: actions/checkout@v3.5.2
with:
token: ${{ secrets.PUSH_TOKEN }}

- name: Download build artifacts
uses: actions/download-artifact@v3
with:
name: bundle
path: dist

- name: Commit bundle files
run: |
git config --global user.name 'github-actions'
git config --global user.email 'github-actions@github.com'
if `git diff --quiet --exit-code`
then
echo "Nothing changed !"
else
git add dist
git commit -m "Automatic build"
git push
fi
3 changes: 1 addition & 2 deletions dist/bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/bundle.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@actions/core": "^1.10.0",
"@actions/glob": "^0.4.0",
"minimatch": "^5.1.0",
"minimatch": "^9.0.0",
"simple-git": "^3.17.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/project.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as core from '@actions/core';
import * as glob from '@actions/glob';
import path from 'path';
import path from 'node:path';

import { Workspace } from './workspace';

Expand Down
6 changes: 3 additions & 3 deletions src/workspace.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as core from '@actions/core';
import { promises as fs } from 'fs';
import minimatch from 'minimatch';
import path from 'path';
import { minimatch } from 'minimatch';
import fs from 'node:fs/promises';
import path from 'node:path';

import { git } from './git';
import { Package } from './package';
Expand Down
4 changes: 2 additions & 2 deletions tests/project.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'path';
import path from 'node:path';

import { Project } from '../src/project';
import { Project } from '@/src/project';

// Constants
const TEST_PROJECT_ROOT = path.join(__dirname, 'project');
Expand Down
8 changes: 4 additions & 4 deletions tests/workspace.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import path from 'path';
import path from 'node:path';

import { git } from '../src/git';
import { Project } from '../src/project';
import { Workspace } from '../src/workspace';
import { git } from '@/src/git';
import { Project } from '@/src/project';
import { Workspace } from '@/src/workspace';

// Constants
const TEST_PROJECT_ROOT = path.join(__dirname, 'project');
Expand Down
1 change: 0 additions & 1 deletion webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { type Configuration } from 'webpack';
import path from 'node:path';

const config: Configuration = {
devtool: 'source-map',
target: 'node16',
entry: './src/index.ts',
mode: 'production',
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2628,7 +2628,7 @@ __metadata:
"@types/minimatch": ^5.1.1
"@types/node": ^16.18.25
jest: ^29.5.0
minimatch: ^5.1.0
minimatch: ^9.0.0
simple-git: ^3.17.0
ts-jest: ^29.1.0
ts-loader: ^9.4.2
Expand Down Expand Up @@ -3416,12 +3416,12 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:^5.1.0":
version: 5.1.0
resolution: "minimatch@npm:5.1.0"
"minimatch@npm:^9.0.0":
version: 9.0.0
resolution: "minimatch@npm:9.0.0"
dependencies:
brace-expansion: ^2.0.1
checksum: 15ce53d31a06361e8b7a629501b5c75491bc2b59712d53e802b1987121d91b433d73fcc5be92974fde66b2b51d8fb28d75a9ae900d249feb792bb1ba2a4f0a90
checksum: 7bd57899edd1d1b0560f50b5b2d1ea4ad2a366c5a2c8e0a943372cf2f200b64c256bae45a87a80915adbce27fa36526264296ace0da57b600481fe5ea3e372e5
languageName: node
linkType: hard

Expand Down

0 comments on commit 9011529

Please sign in to comment.