SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

CI: Some small styling improvements

Browse Source
This commit is contained in:
Daniel Rudolf 2022-03-06 18:04:03 +01:00
parent dde3a76d78
commit 00ac6c0700
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.build/build.sh
View File

@ -263,6 +263,7 @@ echo "Building Pico $BUILD_VERSION ($VERSION)..."
[ -z "$NOCLEAN" ] || echo "Build directory: $BUILD_DIR" [ -z "$NOCLEAN" ] || echo "Build directory: $BUILD_DIR"
echo echo
# prepare dev versions of components
if [ "$VERSION_STABILITY" == "dev" ]; then if [ "$VERSION_STABILITY" == "dev" ]; then
# copy dev version of Pico # copy dev version of Pico
echo "Creating clean working tree copy of '$BUILD_PROJECT'..." echo "Creating clean working tree copy of '$BUILD_PROJECT'..."
@ -327,11 +328,11 @@ if [ "$VERSION_STABILITY" == "dev" ]; then
echo echo
fi fi
# download Composer starter project
if [ "$VERSION_STABILITY" != "dev" ] || [ -z "$PICO_COMPOSER_DIR" ]; then if [ "$VERSION_STABILITY" != "dev" ] || [ -z "$PICO_COMPOSER_DIR" ]; then
PICO_COMPOSER_VERSION="$DEPENDENCY_VERSION" PICO_COMPOSER_VERSION="$DEPENDENCY_VERSION"
[[ "$PICO_COMPOSER_VERSION" == "dev-"* ]] || PICO_COMPOSER_VERSION="$VERSION_MAJOR.$VERSION_MINOR" [[ "$PICO_COMPOSER_VERSION" == "dev-"* ]] || PICO_COMPOSER_VERSION="$VERSION_MAJOR.$VERSION_MINOR"
# download Composer starter project
echo "Setting up Pico's Composer starter project (version '$PICO_COMPOSER_VERSION')..." echo "Setting up Pico's Composer starter project (version '$PICO_COMPOSER_VERSION')..."
"$COMPOSER" create-project --no-install "$PICO_COMPOSER_PROJECT" \ "$COMPOSER" create-project --no-install "$PICO_COMPOSER_PROJECT" \
"$BUILD_DIR/$PICO_COMPOSER_NAME" \ "$BUILD_DIR/$PICO_COMPOSER_NAME" \
@ -342,7 +343,7 @@ fi
# switch to build dir... # switch to build dir...
cd "$BUILD_DIR/$PICO_COMPOSER_NAME" cd "$BUILD_DIR/$PICO_COMPOSER_NAME"
# inject local copy of Pico # inject local component copies
if [ "$VERSION_STABILITY" == "dev" ]; then if [ "$VERSION_STABILITY" == "dev" ]; then
function composer_repo_config { function composer_repo_config {
jq -nc --arg PACKAGE "$1" --arg VERSION "$2" --arg URL "$3" \ jq -nc --arg PACKAGE "$1" --arg VERSION "$2" --arg URL "$3" \
@ -412,6 +413,7 @@ find plugins/ -type d -path 'plugins/*/.git' -print0 | xargs -0 rm -rf
echo "Removing 'index.php' and 'index.php.dist' from 'vendor/$BUILD_PROJECT'" echo "Removing 'index.php' and 'index.php.dist' from 'vendor/$BUILD_PROJECT'"
rm -f "vendor/$BUILD_PROJECT/index.php" rm -f "vendor/$BUILD_PROJECT/index.php"
rm -f "vendor/$BUILD_PROJECT/index.php.dist" rm -f "vendor/$BUILD_PROJECT/index.php.dist"
echo echo
# restore composer.json # restore composer.json

14
.github/actions/install/action.yml vendored
View File

@ -22,13 +22,6 @@ runs:
php-version: ${{ inputs.php-version }} php-version: ${{ inputs.php-version }}
tools: composer, ${{ inputs.php-tools }} tools: composer, ${{ inputs.php-tools }}
- name: Read Pico version
shell: bash
working-directory: ${{ inputs.path }}
run: |
PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"
- name: Setup Composer auth - name: Setup Composer auth
shell: bash shell: bash
working-directory: ${{ inputs.path }} working-directory: ${{ inputs.path }}
@ -75,3 +68,10 @@ runs:
working-directory: ${{ inputs.path }} working-directory: ${{ inputs.path }}
run: | run: |
composer install composer install
- name: Read Pico version
shell: bash
working-directory: ${{ inputs.path }}
run: |
PICO_VERSION="$(php -r 'require("./lib/Pico.php"); echo Pico::VERSION;')"
echo "PICO_VERSION=$PICO_VERSION" | tee -a "$GITHUB_ENV"