Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
taheralfayad committed Apr 4, 2024
1 parent b259bff commit 2062d74
Show file tree
Hide file tree
Showing 12 changed files with 1,405 additions and 1,317 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ env:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.operating-system }}
strategy:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.2']
node-version: [16.19.0]
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/udoit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1']
php-versions: ['8.2']
node-version: [16.19.0]
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-fpm
FROM php:8.2-fpm
ARG ENVIRONMENT_TYPE

#Install dependencies and php extensions
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The system requirements depend on how you install UDOIT. If you use Docker, the

### Manual Installation Method
* Apache or Nginx webserver
* PHP 8.1+
* PHP 8.1, 8.2
* MySQL, MariaDB or PostgreSQL
* Git (If you are using The Git Method below) or if you plan on contributing to UDOIT
* Node v16 is supported; other versions may work
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ UDOIT enables faculty to identify accessibility issues in Canvas by Instructure.
UDOIT was originally developed by the University of Central Florida (UCF) in 2014. In 2020, UDOIT was in need of a code refresh and UCF partnered with Cidi Labs to rewrite UDOIT from the ground up.

## Prerequisites
- PHP 8.1+
- PHP 8.1, 8.2
- Symfony
- Composer
- Node v16 is supported; other versions may work
- Yarn
- MYSQL v5.7 / MariaDB
- MYSQL 5.7+ / MariaDB

## Skills Needed for Installation
To complete this installation you will need the following skills:
Expand Down
2 changes: 1 addition & 1 deletion build/nginx/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-fpm
FROM php:8.2-fpm

RUN apt-get update -y \
&& apt-get install -y nginx libpng-dev zlib1g-dev git unzip
Expand Down
4 changes: 2 additions & 2 deletions build/nginx/Dockerfile.php.pdo.mysql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM php:8.1-fpm
FROM php:8.2-fpm

# PHP extensions
RUN apt-get update && apt-get install -y libpng-dev zlib1g-dev git unzip
RUN docker-php-ext-install gd pdo pdo_mysql
RUN docker-php-ext-install gd pdo pdo_mysql
1 change: 1 addition & 0 deletions build/nginx/php-custom.ini
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
max_execution_time = 180
memory_limit = 800M
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"version": "3.1.0",
"license": "GPL-3.0-only",
"require": {
"php": "^7.4.0 || ^8",
"php": "^7.4.0 || ^8.1 || ^8.2",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-sodium": "*",
"cidilabs/phpally": "~1.2.1",
"ucfopen/phpally": "~1.2.1",
"composer/package-versions-deprecated": "1.11.99.3",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.4",
Expand Down Expand Up @@ -110,7 +110,7 @@
"repositories": [
{
"type": "vcs",
"url": "https://github.com/cidilabs/phpally"
"url": "https://github.com/ucfopen/phpally"
}
]
}
Loading

0 comments on commit 2062d74

Please sign in to comment.