diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b6071ec6b..dc6fef8ef 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index c5efbfff5..2a61024df 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -4,11 +4,11 @@ on: workflow_dispatch: inputs: logLevel: - description: 'Log level' + description: 'Log level' required: true default: 'warning' tags: - description: 'Tags' + description: 'Tags' push: branches: [ doryphore, ectoplasme ] paths: @@ -27,15 +27,13 @@ env: jobs: build: - # it provides - # see https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: shivammathur/setup-php@v2 with: - php-version: '7.3' + php-version: '8.2' extensions: mysqli tools: composer:v2 env: @@ -105,7 +103,7 @@ jobs: -F "admin_email=test@example.com" \ -F "submit=Continue" \ "http://localhost/?PagePrincipale&installAction=install" - + - name: Set wakka.config.php writable run: | sudo chown www-data:www-data ${{ github.workspace }}/wakka.config.php @@ -113,5 +111,3 @@ jobs: - name: Run test suite run: composer test - - diff --git a/Dockerfile b/Dockerfile index da540f280..0b68d03cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lavoweb/php-7.3:composer +FROM lavoweb/php-8.2:composer # Add MySQLi RUN docker-php-ext-install mysqli @@ -19,8 +19,6 @@ RUN mkdir -p themes/margot \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer # Node & NPM & Yarn -RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN apt-get install -y --no-install-recommends nodejs -RUN curl -L https://npmjs.org/install.sh | sh RUN npm install -g yarn -