Skip to content

fix(background-jobs): Fix unit tests with 32-bits #57099

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.

Sign up for GitHub

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

Open
CarlSchwan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(background-jobs): Fix unit tests with 32-bits #57099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e585f2e
fix(background-jobs): Fix unit tests with 32-bits tests
CarlSchwan Dec 15, 2025
492e9e5
ci: run 32bit tests on lib changes
susnux Dec 15, 2025
1c45cb2
fix(birthday-service): Fix on 32 bits system
CarlSchwan Dec 16, 2025
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
30 changes: 23 additions & 7 deletions .github/workflows/phpunit-32bits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ name: PHPUnit 32bits

on:
pull_request:
paths:
- "version.php"
- ".github/workflows/phpunit-32bits.yml"
- "tests/phpunit-autotest.xml"
- "lib/private/Snowflake/*"
workflow_dispatch:
schedule:
- cron: "15 1 * * 1-6"

Expand All @@ -21,10 +15,32 @@ concurrency:
cancel-in-progress: true

jobs:
changes:
runs-on: ubuntu-latest-low
permissions:
contents: read
pull-requests: read

outputs:
src: ${{ steps.changes.outputs.src}}

steps:
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
id: changes
continue-on-error: true
with:
filters: |
src:
- '.github/workflows/phpunit-32bits.yml'
- '3rdparty/**'
- '**/lib/**'
- '**.php'
Comment on lines +36 to +37
Copy link
Contributor

@come-nc come-nc Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the filter is that broad the scheduled run should be removed.

Copy link
Contributor

@susnux susnux Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its a reduced version of the phpunit-DBTYPE so its even less broad. And even the schedule is less frequent than the DB and no DB workflows.


phpunit-32bits:
runs-on: ubuntu-latest

if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
needs: changes
Copy link
Member

@nickvergessen nickvergessen Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this breaks the schedule?

if: needs.changes.outputs.src != 'false'

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CalDAV/BirthdayService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public function buildDateFromContact(string $cardData,
$vEvent->DTSTART['VALUE'] = 'DATE';
$vEvent->add('DTEND');

$dtEndDate = (new \DateTime())->setTimestamp($date->getTimeStamp());
$dtEndDate = \DateTime::createFromInterface($date);
$dtEndDate->add(new \DateInterval('P1D'));
$vEvent->DTEND->setDateTime(
$dtEndDate
Expand Down
4 changes: 2 additions & 2 deletions lib/private/BackgroundJob/JobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public function getDetailsById(string $id): ?array {
$query = $this->connection->getQueryBuilder();
$query->select('*')
->from('jobs')
->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
->where($query->expr()->eq('id', $query->createNamedParameter($id)));
$result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
Expand Down Expand Up @@ -361,7 +361,7 @@ public function setLastRun(IJob $job): void {
$query = $this->connection->getQueryBuilder();
$query->update('jobs')
->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));

if ($job instanceof \OCP\BackgroundJob\TimedJob
&& !$job->isTimeSensitive()) {
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/BackgroundJob/JobListTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function createTempJob($class,
$query = $this->connection->getQueryBuilder();
$query->insert('jobs')
->values([
'id' => $query->createNamedParameter($id, IQueryBuilder::PARAM_INT),
'id' => $query->createNamedParameter($id),
'class' => $query->createNamedParameter($class),
'argument' => $query->createNamedParameter($argument),
'last_run' => $query->createNamedParameter($lastRun, IQueryBuilder::PARAM_INT),
Expand Down
Loading