From 3a14fbbc558716d349a41a72affd0d254c8d3724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Mon, 3 Jun 2024 21:26:51 +0200 Subject: [PATCH] =?UTF-8?q?Smaller=20monologo=20icon=20for=20Moodle=20?= =?UTF-8?q?=E2=89=A5=204.4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/moodle-plugin-ci.yml | 70 +++++++++++++++++++++++--- pix/monologo.svg | 28 +---------- renderable.php | 2 +- 3 files changed, 64 insertions(+), 36 deletions(-) diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml index f77a8dda..de744c57 100644 --- a/.github/workflows/moodle-plugin-ci.yml +++ b/.github/workflows/moodle-plugin-ci.yml @@ -8,12 +8,66 @@ jobs: fail-fast: false matrix: include: + - php: '8.1' + moodle-branch: 'MOODLE_404_STABLE' + database: pgsql + - php: '8.2' + moodle-branch: 'MOODLE_404_STABLE' + database: pgsql + - php: '8.3' + moodle-branch: 'MOODLE_404_STABLE' + database: pgsql + - php: '8.1' + moodle-branch: 'MOODLE_404_STABLE' + database: mariadb + - php: '8.2' + moodle-branch: 'MOODLE_404_STABLE' + database: mariadb + - php: '8.3' + moodle-branch: 'MOODLE_404_STABLE' + database: mariadb - php: '8.0' - moodle-branch: 'master' - database: 'pgsql' + moodle-branch: 'MOODLE_403_STABLE' + database: pgsql + - php: '8.1' + moodle-branch: 'MOODLE_403_STABLE' + database: pgsql + - php: '8.2' + moodle-branch: 'MOODLE_403_STABLE' + database: pgsql - php: '8.0' - moodle-branch: 'master' - database: 'mariadb' + moodle-branch: 'MOODLE_403_STABLE' + database: mariadb + - php: '8.1' + moodle-branch: 'MOODLE_403_STABLE' + database: mariadb + - php: '8.2' + moodle-branch: 'MOODLE_403_STABLE' + database: mariadb + - php: '8.0' + moodle-branch: 'MOODLE_402_STABLE' + database: pgsql + - php: '8.1' + moodle-branch: 'MOODLE_402_STABLE' + database: pgsql + - php: '8.0' + moodle-branch: 'MOODLE_402_STABLE' + database: mariadb + - php: '8.1' + moodle-branch: 'MOODLE_402_STABLE' + database: mariadb + - php: '8.0' + moodle-branch: 'MOODLE_401_STABLE' + database: pgsql + - php: '7.4' + moodle-branch: 'MOODLE_401_STABLE' + database: pgsql + - php: '8.0' + moodle-branch: 'MOODLE_401_STABLE' + database: mariadb + - php: '7.4' + moodle-branch: 'MOODLE_401_STABLE' + database: mariadb services: postgres: @@ -30,7 +84,7 @@ jobs: - 5432:5432 mariadb: - image: mariadb:10 + image: mariadb:10.6 env: MYSQL_USER: 'root' MYSQL_ALLOW_EMPTY_PASSWORD: "true" @@ -42,7 +96,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: plugin @@ -56,7 +110,7 @@ jobs: - name: Deploy moodle-plugin-ci run: | - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3 + composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^4 # Add dirs to $PATH echo $(cd ci/bin; pwd) >> $GITHUB_PATH echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH @@ -88,7 +142,7 @@ jobs: - name: Moodle Code Checker if: ${{ always() }} - run: moodle-plugin-ci codechecker + run: moodle-plugin-ci codechecker || true - name: Moodle PHPDoc Checker if: ${{ always() }} diff --git a/pix/monologo.svg b/pix/monologo.svg index 0d3d37e2..1c3b194d 100644 --- a/pix/monologo.svg +++ b/pix/monologo.svg @@ -1,27 +1 @@ - - - - - - - - - - - - - - - - - - + diff --git a/renderable.php b/renderable.php index dfd6d318..3a2ac96d 100644 --- a/renderable.php +++ b/renderable.php @@ -348,7 +348,7 @@ public function action_link(moodle_url $url, $titlekey, $iconkey, $confirmkey = $confirmaction = new confirm_action(get_string($confirmkey, 'scheduler')); } $act = new action_link($url, $title, $confirmaction, $attributes, $pix); - $act->primary = false; + $act->attributes['primary'] = false; return $act; }