Merge pull request #2745 from Leantime/3.3-dev

Moving 3.3 changes to 4.0 release.

.dev/docker-compose.tests.yaml

@@ -1,3 +1,8 @@
+#
+# This docker compose file is used to build the environment for our testing framework in codeception
+# It is not to be used for development
+#
+
 version: "3.9"
 
 services:
@@ -7,6 +12,9 @@ services:
  - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
  - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
  - "./test.env:/var/www/html/config/.env"
+ ports:
+ - "8002:8080" #Using different ports for testing, so we don't have to worry about collision
+ - "44302:443" #Using different ports for testing, so we don't have to worry about collision (available range is 44300–44399)
  environment:
  LEAN_DB_HOST: 'db'
  LEAN_DB_USER: 'leantime'

.dev/docker-compose.yaml

@@ -2,8 +2,8 @@ version: "3.9"
 
 networks:
  leantime:
-  external: false
-  driver: bridge
+ external: false
+ driver: bridge
 
 volumes:
  mysql:
@@ -13,19 +13,18 @@ services:
  leantime-dev:
  build: .
  ports:
- - "8888:8080"
- - "8443:443"
+ - "8001:8080" #Using ports that are hopefully available. format is: 80XX
+ - "44301:443" #Using ports that are hopefully available. format is: 443XX (available range is 44300–44399)
  volumes:
- - "../:/var/www/html"
- - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
- - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
- # - ".env:/var/www/html/config/.env"
+ - "../:/var/www/html"
+ - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
+ - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
  environment:
- LEAN_DB_HOST: 'db'
- LEAN_DB_USER: 'leantime'
- LEAN_DB_PASSWORD: 'leantime'
- LEAN_DB_DATABASE: 'leantime'
- LEAN_DB_PORT: '3306'
+ LEAN_DB_HOST: "db"
+ LEAN_DB_USER: "leantime"
+ LEAN_DB_PASSWORD: "leantime"
+ LEAN_DB_DATABASE: "leantime"
+ LEAN_DB_PORT: "3306"
  extra_hosts:
  - "host.docker.internal:host-gateway"
  depends_on:
@@ -45,10 +44,10 @@ services:
  ports:
  - "3306"
  environment:
- MYSQL_ROOT_PASSWORD: 'leantime'
- MYSQL_USER: 'leantime'
- MYSQL_PASSWORD: 'leantime'
- MYSQL_DATABASE: 'leantime'
+ MYSQL_ROOT_PASSWORD: "leantime"
+ MYSQL_USER: "leantime"
+ MYSQL_PASSWORD: "leantime"
+ MYSQL_DATABASE: "leantime"
  networks:
  - leantime
  volumes:

.dev/test.env

@@ -1,5 +1,7 @@
-# This is a sample configuration file with all possible configuration options.
-# If you don't want to maintain a file like this you can pass in all variables via Server Variabels
+#
+# This environment file is used for our testing framework
+# It is not to be used for development
+#
 
 ## Minimum Configuration, these are required for installation
 
@@ -42,8 +44,8 @@ LEAN_DB_BACKUP_PATH = 'backupdb/' # Local relative path to stor
 # S3 File Uploads
 LEAN_USE_S3 = false # Set to true if you want to use S3 instead of local files
 LEAN_S3_KEY = 'AKIAIOSFODNN7EXAMPLE' # S3 Key, hardcoded in s3ninja
-LEAN_S3_SECRET = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'  # S3 Secret, hardcoded in s3ninja
-LEAN_S3_BUCKET = 'leantime'  # Your S3 bucket
+LEAN_S3_SECRET = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY' # S3 Secret, hardcoded in s3ninja
+LEAN_S3_BUCKET = 'leantime' # Your S3 bucket
 LEAN_S3_USE_PATH_STYLE_ENDPOINT = true # Sets the endpoint style: false => https://[bucket].[endpoint] ; true => https://[endpoint]/[bucket]
 LEAN_S3_REGION = 'eu-west-1' # S3 region
 LEAN_S3_FOLDER_NAME = '' # Foldername within S3 (can be emtpy)

.github/workflows/acceptancetests.yml

@@ -3,9 +3,9 @@ name: Tests
 on:
  workflow_dispatch:
  push:
- branches: [ "master" ]
+ branches: [ "master", "*.*-dev" ]
  pull_request:
- branches: [ "master" ]
+ branches: [ "master", "*.*-dev" ]
 
 jobs:
  unit:

.github/workflows/makefile.yml

@@ -2,9 +2,9 @@ name: Makefile CI
 
 on:
  push:
- branches: [ "master" ]
+ branches: [ "master", "*.*-dev" ]
  pull_request:
- branches: [ "master" ]
+ branches: [ "master", "*.*-dev" ]
 
 jobs:
  build:

.github/workflows/release.yml

@@ -23,6 +23,7 @@ jobs:
  - name: Get Hash
  id: hash
  run: echo "git_hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
+
  - name: build artifacts
  run: make package
 
@@ -34,9 +35,11 @@ jobs:
  release_version: ${{ steps.version.outputs.version }}
  config_file: .github/changelogConfig.yml
  github_token: ${{ secrets.GITHUB_TOKEN }}
+
  - name: Extract Repo Attributes
  id: attrs
  uses: ibnesayeed/repo-attrs@master
+
  - name: release
  uses: ncipollo/release-action@v1
  id: create_release
@@ -67,6 +70,7 @@ jobs:
  ```
  env:
  GITHUB_TOKEN: ${{ github.token }}
+
  - name: upload zip
  uses: actions/upload-release-asset@v1
  env:
@@ -76,6 +80,7 @@ jobs:
  asset_path: ./target/Leantime-v${{ steps.version.outputs.version }}.zip
  asset_name: Leantime-v${{ steps.version.outputs.version }}.zip
  asset_content_type: application/gzip
+
  - name: upload tar
  uses: actions/upload-release-asset@v1
  env:

.github/workflows/staticAnalysis.yml

@@ -2,7 +2,7 @@ name: Static Analysis
 
 on:
  pull_request:
- branches: [ "master" ]
+ branches: [ "master", "*.*-dev" ]
 
 jobs:
  phpstan:
@@ -12,5 +12,14 @@ jobs:
  steps:
  - uses: actions/checkout@v3
 
+ - name: Install Dependencies
+ run: make build-dev
+
+ - name: Run Tests
+ run: make build-dev
+
+ - name: Run Code Style Tests
+ run: make test-code-style
+
  - name: Run Tests
  run: make phpstan

.gitignore

@@ -118,3 +118,7 @@ config/.env
 
 # Local Dev Files
 .dev/docker-compose.local.yaml
+
+/caddy
+frankenphp
+frankenphp-worker.php