-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/4.0.1' into v4
- Loading branch information
Showing
37 changed files
with
6,153 additions
and
2,032 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| name: Build and Deploy Docs | ||
| env: | ||
| DOCS_DEST_DIR: /route-map/ | ||
| DOCS_DEST_DIR: /route-map/v4/ | ||
| on: | ||
| push: | ||
| branches: | ||
| - v1 | ||
| - v4 | ||
| paths: | ||
| - 'docs/**' | ||
| pull_request: | ||
| branches: | ||
| - v1 | ||
| - v4 | ||
| paths: | ||
| - 'docs/**' | ||
| workflow_dispatch: | ||
|
|
@@ -22,11 +22,11 @@ jobs: | |
| strategy: | ||
| fail-fast: true | ||
| matrix: | ||
| node-version: [ 14.x ] | ||
| node-version: [ 20.x ] | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v4 | ||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v2 | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| - run: npm ci | ||
|
|
@@ -35,7 +35,7 @@ jobs: | |
| - name: rsync deployments | ||
| uses: burnett01/[email protected] | ||
| with: | ||
| switches: -avzr --delete | ||
| switches: -avzr | ||
| path: ./dist/ | ||
| remote_path: ${{ secrets.NYS_DOCS_ROOT }}${{ env.DOCS_DEST_DIR }} | ||
| remote_host: ${{ secrets.NYS_DEPLOY_REMOTE_HOST }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: Code Analysis | ||
|
|
||
| on: | ||
| pull_request: null | ||
| push: | ||
| branches: | ||
| - develop-v4 | ||
| workflow_dispatch: | ||
| permissions: | ||
| contents: read | ||
| jobs: | ||
| code_analysis: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| actions: | ||
| - | ||
| name: 'PHPStan' | ||
| run: composer phpstan | ||
| - | ||
| name: 'Coding Standards' | ||
| run: composer fix-cs | ||
| name: ${{ matrix.actions.name }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Cache Composer dependencies | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: /tmp/composer-cache | ||
| key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} | ||
| - name: Setup PHP | ||
| id: setup-php | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: 8.2 | ||
| extensions: 'ctype,curl,dom,iconv,imagick,intl,json,mbstring,openssl,pcre,pdo,reflection,spl,zip' | ||
| ini-values: post_max_size=256M, max_execution_time=180, memory_limit=512M | ||
| tools: composer:v2 | ||
| - name: Install Composer dependencies | ||
| run: composer install --no-interaction --no-ansi --no-progress | ||
| - run: ${{ matrix.actions.run }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: Create Release | ||
| run-name: Create release for ${{ github.event.client_payload.version }} | ||
|
|
||
| on: | ||
| repository_dispatch: | ||
| types: | ||
| - craftcms/new-release | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - uses: ncipollo/release-action@v1 | ||
| with: | ||
| body: ${{ github.event.client_payload.notes }} | ||
| makeLatest: ${{ github.event.client_payload.latest }} | ||
| name: ${{ github.event.client_payload.version }} | ||
| prerelease: ${{ github.event.client_payload.prerelease }} | ||
| tag: ${{ github.event.client_payload.tag }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| The MIT License (MIT) | ||
|
|
||
| Copyright (c) 2017 nystudio107 | ||
| Copyright (c) nystudio107 | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| MAJOR_VERSION?=4 | ||
| PLUGINDEV_PROJECT_DIR?=/Users/andrew/webdev/sites/plugindev/cms_v${MAJOR_VERSION}/ | ||
| VENDOR?=nystudio107 | ||
| PROJECT_PATH?=${VENDOR}/$(shell basename $(CURDIR)) | ||
|
|
||
| .PHONY: dev docs release | ||
|
|
||
| # Start up the buildchain dev server | ||
| dev: | ||
| # Start up the docs dev server | ||
| docs: | ||
| ${MAKE} -C docs/ dev | ||
| # Run code quality tools, tests, and build the buildchain & docs in preparation for a release | ||
| release: --code-quality --code-tests --buildchain-clean-build --docs-clean-build | ||
| # The internal targets used by the dev & release targets | ||
| --buildchain-clean-build: | ||
| --code-quality: | ||
| ${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- ecs check vendor/${PROJECT_PATH}/src --fix | ||
| ${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- phpstan analyze -c vendor/${PROJECT_PATH}/phpstan.neon | ||
| --code-tests: | ||
| --docs-clean-build: | ||
| ${MAKE} -C docs/ clean | ||
| ${MAKE} -C docs/ image-build | ||
| ${MAKE} -C docs/ fix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| /vendor | ||
| /node_modules | ||
| /docs/.vitepress/dist | ||
| /docs/.vitepress/cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,47 @@ | ||
| TAG?=14-alpine | ||
| CONTAINER?=$(shell basename $(dir $(CURDIR)))-docs | ||
| DOCKERRUN=docker container run \ | ||
| --name ${CONTAINER} \ | ||
| --rm \ | ||
| -p 3002:3002 \ | ||
| -t \ | ||
| -v `pwd`:/app \ | ||
| ${CONTAINER}:${TAG} | ||
| DOCSDEST?=../../../sites/nystudio107/web/docs/route-map | ||
| MAJOR_VERSION?=4 | ||
| TAG?=20-alpine | ||
| CONTAINER?=$(shell basename $(dir $(CURDIR)))-v${MAJOR_VERSION}-docs | ||
| DOCS_DEV_PORT?=400${MAJOR_VERSION} | ||
| DOCS_DEST?=../../../sites/nystudio107/web/docs/route-map/v4 | ||
| IMAGE_INFO=$(shell docker image inspect $(CONTAINER):$(TAG)) | ||
| IMAGE_NAME=${CONTAINER}:${TAG} | ||
| DOCKER_RUN=docker container run --rm -it -v "${CURDIR}":/app | ||
|
|
||
| .PHONY: docker build dev fix install lint clean npm | ||
| .PHONY: build clean dev fix image-build image-check lint npm ssh | ||
|
|
||
| docker: | ||
| docker build \ | ||
| . \ | ||
| -t ${CONTAINER}:${TAG} \ | ||
| --build-arg TAG=${TAG} \ | ||
| --no-cache | ||
| build: clean docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:build | ||
| rm -rf ${DOCSDEST} | ||
| mv ./docs/.vitepress/dist ${DOCSDEST} | ||
| dev: docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:dev | ||
| fix: docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:fix | ||
| install: docker | ||
| ${DOCKERRUN} \ | ||
| install | ||
| lint: docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:lint | ||
| clean: docker | ||
| # Perform a dist build via npm run docs:build | ||
| build: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} run docs:build | ||
| rm -rf ${DOCS_DEST} | ||
| mv ./docs/.vitepress/dist ${DOCS_DEST} | ||
| # Remove node_modules/ & package-lock.json | ||
| clean: | ||
| rm -rf node_modules/ | ||
| rm -f package-lock.json | ||
| npm: docker | ||
| ${DOCKERRUN} \ | ||
| $(filter-out $@,$(MAKECMDGOALS)) | ||
| # Run the development server via npm run docs:dev | ||
| dev: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ -e DOCS_DEV_PORT="${DOCS_DEV_PORT}" -p ${DOCS_DEV_PORT}:${DOCS_DEV_PORT} ${IMAGE_NAME} run docs:dev | ||
| # Fix the docs with textlint via npm run docs:fix | ||
| fix: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} run docs:fix | ||
| # Build the Docker image & run npm install | ||
| image-build: | ||
| docker build . -t ${IMAGE_NAME} --build-arg TAG=${TAG} --no-cache | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} install | ||
| # Ensure the image has been created | ||
| image-check: | ||
| ifeq ($(IMAGE_INFO), []) | ||
| image-check: image-build | ||
| endif | ||
| # Lint the docs with textlint via npm run docs:lint | ||
| lint: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} run docs:lint | ||
| # Run the passed in npm command | ||
| npm: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} $(filter-out $@,$(MAKECMDGOALS)) $(MAKEFLAGS) | ||
| # Open a shell inside of the container | ||
| ssh: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ --entrypoint=/bin/sh ${IMAGE_NAME} | ||
| %: | ||
| @: | ||
| # ref: https://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line |
Oops, something went wrong.