Merge pull request #3325 from codeigniter4/develop

4.0.4 Ready code

Author: lonnieezell

.github/scripts/deploy-appstarter

@@ -20,7 +20,7 @@ git checkout master
 rm -rf *
 
 # Copy common files
-releasable='app public writable env license.txt spark .gitignore'
+releasable='app public writable env license.txt spark'
 for fff in $releasable ; do
     cp -Rf ${SOURCE}/$fff ./
 done

.github/scripts/deploy-framework

@@ -20,7 +20,7 @@ git checkout master
 rm -rf *
 
 # Copy common files
-releasable='app public writable env license.txt spark .gitignore system'
+releasable='app public writable env license.txt spark system'
 for fff in $releasable ; do
     cp -Rf ${SOURCE}/$fff ./
 done

.github/workflows/apidocs-action.yml

@@ -0,0 +1,72 @@
+name: API Documentation
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - 'system/**'
+
+jobs:
+
+  build:
+    name: Generate API Docs
+    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup credentials
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "${GITHUB_ACTOR}"
+
+      - name: Checkout source
+        uses: actions/checkout@v2
+        with:
+          path: source
+
+      - name: Checkout api
+        uses: actions/checkout@v2
+        with:
+          repository: codeigniter4/api
+          token: ${{ secrets.ACCESS_TOKEN }}
+          path: api
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.2'
+          extensions: intl, json, mbstring, mysqlnd, xdebug, xml, sqlite3
+          coverage: xdebug
+
+      - name: Download GraphViz for phpDocumentor
+        run: |
+          sudo apt-get install -yq graphviz
+
+      - name: Download phpDocumentor
+        run: |
+          cd ./source
+          curl \
+            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v2.9.1/phpDocumentor.phar \
+            -o admin/phpDocumentor.phar
+
+      - name: Prepare API
+        run: |
+          cd ./api
+          rm -rf ./api/docs*
+          mkdir -p ./api/docs
+          git reset --hard master
+
+      - name: Make the new API docs
+        run: |
+          cd ./source
+          chmod +x admin/phpDocumentor.phar
+          admin/phpDocumentor.phar
+          cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
+
+      - name: Deploy API
+        run: |
+          cd ./api
+          git add .
+          git commit -m "API sync for ${GITHUB_SHA}"
+          git push

.github/workflows/docs_nightly.yml

@@ -0,0 +1,52 @@
+# When changes are pushed to the develop branch,
+# build the current version of the docs and
+# deploy to gh-pages so that our development
+# docs are always up to date.
+name: "Update development docs"
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - 'user_guide_src/**'
+
+jobs:
+  build:
+    if: (github.repository == 'codeigniter4/CodeIgniter4')
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    # Build the current docs
+    - uses: ammaraskar/sphinx-action@master
+      with:
+        docs-folder: "user_guide_src/"
+
+    # Create an artifact of the html output
+    - uses: actions/upload-artifact@v2
+      with:
+        name: HTML Documentation
+        path: user_guide_src/build/html/
+
+    # Commit changes to the gh-pages branch
+    - name: Commit documentation changes
+      run: |
+        git clone https://github.com/codeigniter4/CodeIgniter4.git --branch gh-pages --single-branch gh-pages
+        cp -r user_guide_src/build/html/* gh-pages/
+        cd gh-pages
+        git config --local user.email "action@github.com"
+        git config --local user.name "${GITHUB_ACTOR}"
+        git add .
+        git commit -m "Update documentation" -a || true
+        # The above command will fail if no changes were present, so we ignore
+        # that.
+
+    - name: Push changes
+      uses: ad-m/github-push-action@master
+      with:
+        branch: gh-pages
+        directory: gh-pages
+        github_token: ${{ secrets.ACCESS_TOKEN }}

.github/workflows/userguide_ci.yml

@@ -0,0 +1,17 @@
+# Builds the user guide and lets the contributor know of
+# any user guide build errors.
+name: UserGuide CI
+
+on:
+  pull_request:
+    paths:
+      - 'user_guide_src/**'
+
+jobs:
+  syntax_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ammaraskar/sphinx-action@master
+        with:
+          docs-folder: user_guide_src

.gitignore

@@ -62,15 +62,15 @@ writable/uploads/*
 
 writable/debugbar/*
 
+writable/**/*.db
+writable/**/*.sqlite
+
 php_errors.log
 
 #-------------------------
 # User Guide Temp Files
 #-------------------------
 user_guide_src/build/*
-user_guide_src/cilexer/build/*
-user_guide_src/cilexer/dist/*
-user_guide_src/cilexer/pycilexer.egg-info/*
 
 #-------------------------
 # Test Files

.travis.yml

@@ -42,6 +42,8 @@ before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;
   - mysql -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'test';" -uroot
   - psql -c 'CREATE DATABASE test;' -U postgres
+  - sudo apt-get install ghostscript
+  - yes | pecl install imagick
 
 before_script:
   - echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini