Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed failing tests in Github CI for Ubuntu 22.04 #2134

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/act/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM ubuntu-latest

# Install necessary dependencies
RUN apt-get update && apt-get install -y \
sudo \
git \
curl \
&& rm -rf /var/lib/apt/lists/*

# Get correct version of nodejs
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - \
&& sudo apt install -y nodejs

# Create a non-root user (same as GitHub Actions)
RUN useradd -m runner && \
echo "runner ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers

# Set user to 'runner'
USER runner

# Set working directory (GitHub Actions uses this location)
WORKDIR /home/runner

CMD ["/bin/bash"]
41 changes: 26 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,26 @@ name: Shaarli CI
on: [push, pull_request]
jobs:
php:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
php-versions: ['7.4', '8.0', '8.1', '8.2']
name: PHP ${{ matrix.php-versions }}
steps:
- name: Set locales
run: |
sudo locale-gen de_DE.utf8 && \
sudo locale-gen en_US.utf8 && \
sudo locale-gen fr_FR.utf8 && \
sudo dpkg-reconfigure --frontend=noninteractive locales

- name: Install Gettext
run: sudo apt-get install gettext

- name: Checkout
uses: actions/checkout@v4

- name: Install Gettext
run: |
sudo apt-get update && \
sudo apt-get install -y gettext

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: gd, xml, curl, mbstring, intl, gettext
extensions: gd, xml, curl, mbstring, intl, gettext, ldap
tools: composer:v2

- name: Check PHP version
Expand All @@ -36,16 +31,32 @@ jobs:
run: composer config --unset platform && composer config platform.php ${{ matrix.php-versions }}

- name: Update dependencies for PHP 8.x
if: ${{ matrix.php-versions == '8.0' || matrix.php-versions == '8.1' }}
if: ${{ matrix.php-versions != '7.4' }}
run: |
composer update && \
composer remove --dev phpunit/phpunit && \
composer require --dev phpunit/php-text-template ^2.0 && \
composer require --dev phpunit/phpunit ^9.0

- name: Update dependencies for PHP 7.x
if: ${{ matrix.php-versions != '8.0' && matrix.php-versions != '8.1' }}
run: composer update
if: ${{ matrix.php-versions == '7.4' }}
run: |
composer update && \
echo php -v

- name: Install locales
run: |
sudo apt-get update && \
sudo apt-get install -y locales

- name: Set locales
run: |
sudo locale-gen de_DE.utf8 && \
sudo locale-gen en_US.utf8 && \
sudo locale-gen fr_FR.utf8

- name: Check locales
run: locale -a

- name: Clean up
run: make clean
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "7.4.33"
"php": "8.2"
}
},
"require": {
Expand All @@ -30,9 +30,10 @@
"slim/slim": "^3.0"
},
"require-dev": {
"phpunit/php-text-template": "^2.0",
"phpunit/phpunit": "^9.0",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^3.0",
"phpunit/phpunit": "^9.0"
"squizlabs/php_codesniffer": "^3.0"
},
"suggest": {
"ext-curl": "Allows fetching web pages and thumbnails in a more robust way",
Expand Down
Loading