Skip to content

Commit

Permalink
Merge branch '7.0' into 7.1
Browse files Browse the repository at this point in the history
* 7.0:
  [AllBundles] Fix FE build
  Bump actions/setup-node from 3 to 4
  Bump actions/cache from 3.3.1 to 3.3.2
  Bump actions/checkout from 3 to 4
  • Loading branch information
acrobat committed Dec 20, 2023
2 parents fd5fb9c + 41663b5 commit 9415dd1
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 702 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
symfony: '^5.4'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set-up env variables
run: |
Expand All @@ -45,7 +45,7 @@ jobs:
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- uses: actions/[email protected].1
- uses: actions/[email protected].2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -72,6 +72,6 @@ jobs:
name: Validate composer files
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: sh ./.build/validate-composer.sh || exit $?
4 changes: 2 additions & 2 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/subtree-split.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Sync commits
if: github.repository == 'Kunstmaan/KunstmaanBundlesCMS'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0
Expand All @@ -31,7 +31,7 @@ jobs:
user_email: '[email protected]'

- name: Cache splitsh-lite
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: |
./splitsh
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14
v16
4 changes: 3 additions & 1 deletion groundcontrol/tasks/css.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import gulp from 'gulp';
import sass from 'gulp-sass';
import dartSass from 'sass';
import notifier from 'node-notifier';
import sourcemaps from 'gulp-sourcemaps';
import postcss from 'gulp-postcss';
import rev from 'gulp-rev';
import cssnano from 'cssnano';
import autoprefixer from 'autoprefixer';
import debug from 'gulp-debug';
import gulpSass from 'gulp-sass';
const sass = gulpSass(dartSass);

export function createCssLocalTask({ src = undefined, dest = undefined }) {
return function cssLocal() {
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@
"gulp-inject": "^4.2.0",
"gulp-postcss": "^8.0.0",
"gulp-rev": "^9.0.0",
"gulp-sass": "^4.1.0",
"gulp-sass": "^5.1.0",
"gulp-sourcemaps": "^2.4.1",
"gulp-uglify": "^2.1.2",
"gulp-util": "^3.0.8",
"mime-types": "^2.1.15",
"node-notifier": "^9.0.0",
"postcss-reporter": "^3.0.0",
"postcss-scss": "^1.0.6",
"sass": "^1.69.5",
"stylelint": "^13.6.1",
"stylelint-config-standard": "^16.0.0",
"stylelint-order": "^4.1.0",
Expand All @@ -62,7 +63,6 @@
"dependencies": {
"@fortawesome/fontawesome-free": "^5.5.0",
"@snipsonian/scss": "1.8.2",
"svgxuse": "^1.2.6",
"bootstrap-sass": "^3.4.1",
"cargobay": "Kunstmaan/cargobay#0.8.6-support",
"cropperjs": "^1.5.6",
Expand All @@ -74,9 +74,10 @@
"picturefill": "^3.0.2",
"plupload": "^2.3.6",
"select2": "^4.0.3",
"smoothscroll-polyfill": "^0.4.2",
"sortablejs": "^1.8.1",
"svgxuse": "^1.2.6",
"velocity-animate": "^1.5.2",
"x-editable": "^1.5.1",
"smoothscroll-polyfill": "^0.4.2"
"x-editable": "^1.5.1"
}
}
8 changes: 4 additions & 4 deletions src/Kunstmaan/AdminBundle/Resources/public/css/style.css

Large diffs are not rendered by default.

Loading

0 comments on commit 9415dd1

Please sign in to comment.