mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 10:13:51 +01:00
CI improvements (#4236)
* feat(ci): run pull request runs only on pull request open #4205 * feat(ci): add retry action for tsan #4205 * feat(ci): use local action for retrying tsan #4205 * fix(ci): use correct version of retry action #4205 * fix: make POSIX event thread safe * feat(ci): add info on retry action to ci.yml header #4205 * feat(ci): add linux mysql test #4205 * feat(ci): remove unused mysql containers from tests#4205 * feat(ci): add linux postgre test #4205 * feat(ci): add linux redis test #4205 * feat(ci): add linux mongodb tests #4205 * feat(ci): add mysql odbc test #4205 * chore(ci): rename tests #4205 * chore(ci): pin postgres and mysql versions #4205 * feat(ci): add odbc postgres tests #4205 * chore(ci): mysql odbc comment #4205 * chore(ci): disable windows 2019 job #4205 * feat(ci): add linux oracle tests #4205 * chore(ci): disable oracle tests #4205 * feat(ci): add sql server tests #4205 * chore(ci): disable postgres tests #4205 * chore(ci): add logging for task test #4205 * feat(ci): add local retry action #4205 * feat(ci): ignore process kill failure in action #4205 * feat(ci): send SIGKILL instead of SIGTERM in action #4205 * chore(ci): add updated action #4205 * chore(ci): reduce tsan timeout #4205 * feat(ci): kill process without children #4205 * feat(ci): send SIGTERM to child in action #4205 * feat(ci): prolong tsan timeout #4205 * chore(ci): add missing newlines #4205 * fix(ci): revert sql server test FreeTDS version #4205 * feat(ci): add retry to all jobs #4205 * feat(ci): setup python for codeQL #4205 * chore(ci): disable throwing on codeql error #4205
This commit is contained in:
Nino Belušić
GitHub
parent
743da564eb
commit
90dd3821ed
54
.github/actions/retry-action/action.yml
vendored
Normal file
54
.github/actions/retry-action/action.yml
vendored
Normal file
@ -0,0 +1,54 @@
|
||||
name: Retry Step
|
||||
description: 'Retry a step on failure or timeout'
|
||||
inputs:
|
||||
timeout_minutes:
|
||||
description: Minutes to wait before attempt times out. Must only specify either minutes or seconds
|
||||
required: false
|
||||
timeout_seconds:
|
||||
description: Seconds to wait before attempt times out. Must only specify either minutes or seconds
|
||||
required: false
|
||||
max_attempts:
|
||||
description: Number of attempts to make before failing the step
|
||||
required: true
|
||||
default: 3
|
||||
command:
|
||||
description: The command to run
|
||||
required: true
|
||||
retry_wait_seconds:
|
||||
description: Number of seconds to wait before attempting the next retry
|
||||
required: false
|
||||
default: 10
|
||||
shell:
|
||||
description: Alternate shell to use (defaults to powershell on windows, bash otherwise). Supports bash, python, pwsh, sh, cmd, and powershell
|
||||
required: false
|
||||
polling_interval_seconds:
|
||||
description: Number of seconds to wait for each check that command has completed running
|
||||
required: false
|
||||
default: 1
|
||||
retry_on:
|
||||
description: Event to retry on. Currently supported [any, timeout, error]
|
||||
warning_on_retry:
|
||||
description: Whether to output a warning on retry, or just output to info. Defaults to true
|
||||
default: true
|
||||
on_retry_command:
|
||||
description: Command to run before a retry (such as a cleanup script). Any error thrown from retry command is caught and surfaced as a warning.
|
||||
required: false
|
||||
continue_on_error:
|
||||
description: Exits successfully even if an error occurs. Same as native continue-on-error behavior, but for use in composite actions. Default is false
|
||||
default: false
|
||||
new_command_on_retry:
|
||||
description: Command to run if the first attempt fails. This command will be called on all subsequent attempts.
|
||||
required: false
|
||||
retry_on_exit_code:
|
||||
description: Specific exit code to retry on. This will only retry for the given error code and fail immediately other error codes.
|
||||
required: false
|
||||
outputs:
|
||||
total_attempts:
|
||||
description: The final number of attempts made
|
||||
exit_code:
|
||||
description: The final exit code returned by the command
|
||||
exit_error:
|
||||
description: The final error returned by the command
|
||||
runs:
|
||||
using: 'node16'
|
||||
main: 'dist/index.js'
|
||||
26403
.github/actions/retry-action/dist/index.js
vendored
Normal file
26403
.github/actions/retry-action/dist/index.js
vendored
Normal file
File diff suppressed because one or more lines are too long
67
.github/actions/retry-action/package.json
vendored
Normal file
67
.github/actions/retry-action/package.json
vendored
Normal file
@ -0,0 +1,67 @@
|
||||
{
|
||||
"name": "retry",
|
||||
"version": "0.0.0-managed-by-semantic-release",
|
||||
"description": "Retries a GitHub Action step on failure or timeout.",
|
||||
"scripts": {
|
||||
"lint:base": "eslint --config ./.config/.eslintrc.js ",
|
||||
"lint": "npm run lint:base -- .",
|
||||
"local": "npm run prepare && node -r dotenv/config ./dist/index.js",
|
||||
"prepare": "ncc build src/index.ts",
|
||||
"style:base": "prettier --config ./.config/.prettierrc.yml --ignore-path ./.config/.prettierignore --write ",
|
||||
"style": "npm run style:base -- .",
|
||||
"test": "jest -c ./.config/jest.config.js"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/nick-invision/retry.git"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "Nick Fields",
|
||||
"license": "ISC",
|
||||
"bugs": {
|
||||
"url": "https://github.com/nick-invision/retry/issues"
|
||||
},
|
||||
"homepage": "https://github.com/nick-invision/retry#readme",
|
||||
"dependencies": {
|
||||
"@actions/core": "^1.10.0",
|
||||
"milliseconds": "^1.0.3",
|
||||
"tree-kill": "^1.2.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^16.2.3",
|
||||
"@commitlint/config-conventional": "^16.2.1",
|
||||
"@semantic-release/changelog": "^6.0.1",
|
||||
"@semantic-release/git": "^10.0.1",
|
||||
"@types/babel-generator": "^6.25.7",
|
||||
"@types/jest": "^28.1.6",
|
||||
"@types/milliseconds": "0.0.30",
|
||||
"@types/node": "^16.11.7",
|
||||
"@typescript-eslint/eslint-plugin": "^5.32.0",
|
||||
"@typescript-eslint/parser": "^5.32.0",
|
||||
"@vercel/ncc": "^0.38.1",
|
||||
"dotenv": "8.2.0",
|
||||
"eslint": "^8.21.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"husky": "^8.0.1",
|
||||
"jest": "^28.1.3",
|
||||
"lint-staged": "^13.0.3",
|
||||
"prettier": "^2.7.1",
|
||||
"semantic-release": "19.0.3",
|
||||
"ts-jest": "^28.0.7",
|
||||
"ts-node": "9.0.0",
|
||||
"typescript": "^4.7.4",
|
||||
"yaml-lint": "^1.7.0"
|
||||
},
|
||||
"lint-staged": {
|
||||
"**/*.ts": [
|
||||
"npm run style:base --",
|
||||
"npm run lint:base --"
|
||||
],
|
||||
"**/*.{md,yaml,yml}": [
|
||||
"npm run style:base --"
|
||||
],
|
||||
"**/*.{yaml,yml}": [
|
||||
"npx yamllint "
|
||||
]
|
||||
}
|
||||
}
|
||||
191
.github/actions/retry-action/src/index.ts
vendored
Normal file
191
.github/actions/retry-action/src/index.ts
vendored
Normal file
@ -0,0 +1,191 @@
|
||||
import { error, warning, info, debug, setOutput } from '@actions/core';
|
||||
import { execSync, spawn } from 'child_process';
|
||||
import ms from 'milliseconds';
|
||||
|
||||
import { getInputs, getTimeout, Inputs, validateInputs } from './inputs';
|
||||
import { retryWait, wait } from './util';
|
||||
|
||||
const OS = process.platform;
|
||||
const OUTPUT_TOTAL_ATTEMPTS_KEY = 'total_attempts';
|
||||
const OUTPUT_EXIT_CODE_KEY = 'exit_code';
|
||||
const OUTPUT_EXIT_ERROR_KEY = 'exit_error';
|
||||
|
||||
let exit: number;
|
||||
let done: boolean;
|
||||
|
||||
function getExecutable(inputs: Inputs): string {
|
||||
if (!inputs.shell) {
|
||||
return OS === 'win32' ? 'powershell' : 'bash';
|
||||
}
|
||||
|
||||
let executable: string;
|
||||
const shellName = inputs.shell.split(' ')[0];
|
||||
|
||||
switch (shellName) {
|
||||
case 'bash':
|
||||
case 'python':
|
||||
case 'pwsh': {
|
||||
executable = inputs.shell;
|
||||
break;
|
||||
}
|
||||
case 'sh': {
|
||||
if (OS === 'win32') {
|
||||
throw new Error(`Shell ${shellName} not allowed on OS ${OS}`);
|
||||
}
|
||||
executable = inputs.shell;
|
||||
break;
|
||||
}
|
||||
case 'cmd':
|
||||
case 'powershell': {
|
||||
if (OS !== 'win32') {
|
||||
throw new Error(`Shell ${shellName} not allowed on OS ${OS}`);
|
||||
}
|
||||
executable = shellName + '.exe' + inputs.shell.replace(shellName, '');
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
throw new Error(
|
||||
`Shell ${shellName} not supported. See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells`
|
||||
);
|
||||
}
|
||||
}
|
||||
return executable;
|
||||
}
|
||||
|
||||
async function runRetryCmd(inputs: Inputs): Promise<void> {
|
||||
// if no retry script, just continue
|
||||
if (!inputs.on_retry_command) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await execSync(inputs.on_retry_command, { stdio: 'inherit' });
|
||||
// eslint-disable-next-line
|
||||
} catch (error: any) {
|
||||
info(`WARNING: Retry command threw the error ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
async function runCmd(attempt: number, inputs: Inputs) {
|
||||
const end_time = Date.now() + getTimeout(inputs);
|
||||
const executable = getExecutable(inputs);
|
||||
|
||||
exit = 0;
|
||||
done = false;
|
||||
let timeout = false;
|
||||
|
||||
debug(`Running command ${inputs.command} on ${OS} using shell ${executable}`);
|
||||
const child =
|
||||
attempt > 1 && inputs.new_command_on_retry
|
||||
? spawn(inputs.new_command_on_retry, { shell: executable })
|
||||
: spawn(inputs.command, { shell: executable });
|
||||
|
||||
child.stdout?.on('data', (data) => {
|
||||
process.stdout.write(data);
|
||||
});
|
||||
child.stderr?.on('data', (data) => {
|
||||
process.stdout.write(data);
|
||||
});
|
||||
|
||||
child.on('exit', (code, signal) => {
|
||||
debug(`Code: ${code}`);
|
||||
debug(`Signal: ${signal}`);
|
||||
|
||||
// timeouts are killed manually
|
||||
if (signal === 'SIGTERM') {
|
||||
return;
|
||||
}
|
||||
|
||||
// On Windows signal is null.
|
||||
if (timeout) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (code && code > 0) {
|
||||
exit = code;
|
||||
}
|
||||
|
||||
done = true;
|
||||
});
|
||||
|
||||
do {
|
||||
await wait(ms.seconds(inputs.polling_interval_seconds));
|
||||
} while (Date.now() < end_time && !done);
|
||||
|
||||
if (!done && child.pid) {
|
||||
timeout = true;
|
||||
try {
|
||||
child.kill();
|
||||
}
|
||||
catch(e) {
|
||||
//ignore if process can't be killed
|
||||
}
|
||||
await retryWait(ms.seconds(inputs.retry_wait_seconds));
|
||||
throw new Error(`Timeout of ${getTimeout(inputs)}ms hit`);
|
||||
} else if (exit > 0) {
|
||||
await retryWait(ms.seconds(inputs.retry_wait_seconds));
|
||||
throw new Error(`Child_process exited with error code ${exit}`);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
async function runAction(inputs: Inputs) {
|
||||
await validateInputs(inputs);
|
||||
|
||||
for (let attempt = 1; attempt <= inputs.max_attempts; attempt++) {
|
||||
try {
|
||||
// just keep overwriting attempts output
|
||||
setOutput(OUTPUT_TOTAL_ATTEMPTS_KEY, attempt);
|
||||
await runCmd(attempt, inputs);
|
||||
info(`Command completed after ${attempt} attempt(s).`);
|
||||
break;
|
||||
// eslint-disable-next-line
|
||||
} catch (error: any) {
|
||||
if (attempt === inputs.max_attempts) {
|
||||
throw new Error(`Final attempt failed. ${error.message}`);
|
||||
} else if (!done && inputs.retry_on === 'error') {
|
||||
// error: timeout
|
||||
throw error;
|
||||
} else if (inputs.retry_on_exit_code && inputs.retry_on_exit_code !== exit) {
|
||||
throw error;
|
||||
} else if (exit > 0 && inputs.retry_on === 'timeout') {
|
||||
// error: error
|
||||
throw error;
|
||||
} else {
|
||||
await runRetryCmd(inputs);
|
||||
if (inputs.warning_on_retry) {
|
||||
warning(`Attempt ${attempt} failed. Reason: ${error.message}`);
|
||||
} else {
|
||||
info(`Attempt ${attempt} failed. Reason: ${error.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const inputs = getInputs();
|
||||
|
||||
runAction(inputs)
|
||||
.then(() => {
|
||||
setOutput(OUTPUT_EXIT_CODE_KEY, 0);
|
||||
process.exit(0); // success
|
||||
})
|
||||
.catch((err) => {
|
||||
// exact error code if available, otherwise just 1
|
||||
const exitCode = exit > 0 ? exit : 1;
|
||||
|
||||
if (inputs.continue_on_error) {
|
||||
warning(err.message);
|
||||
} else {
|
||||
error(err.message);
|
||||
}
|
||||
|
||||
// these can be helpful to know if continue-on-error is true
|
||||
setOutput(OUTPUT_EXIT_ERROR_KEY, err.message);
|
||||
setOutput(OUTPUT_EXIT_CODE_KEY, exitCode);
|
||||
|
||||
// if continue_on_error, exit with exact error code else exit gracefully
|
||||
// mimics native continue-on-error that is not supported in composite actions
|
||||
process.exit(inputs.continue_on_error ? 0 : exitCode);
|
||||
});
|
||||
94
.github/actions/retry-action/src/inputs.ts
vendored
Normal file
94
.github/actions/retry-action/src/inputs.ts
vendored
Normal file
@ -0,0 +1,94 @@
|
||||
import { getInput } from '@actions/core';
|
||||
import ms from 'milliseconds';
|
||||
|
||||
export interface Inputs {
|
||||
timeout_minutes: number | undefined;
|
||||
timeout_seconds: number | undefined;
|
||||
max_attempts: number;
|
||||
command: string;
|
||||
retry_wait_seconds: number;
|
||||
shell: string | undefined;
|
||||
polling_interval_seconds: number;
|
||||
retry_on: string | undefined;
|
||||
warning_on_retry: boolean;
|
||||
on_retry_command: string | undefined;
|
||||
continue_on_error: boolean;
|
||||
new_command_on_retry: string | undefined;
|
||||
retry_on_exit_code: number | undefined;
|
||||
}
|
||||
|
||||
export function getInputNumber(id: string, required: boolean): number | undefined {
|
||||
const input = getInput(id, { required });
|
||||
const num = Number.parseInt(input);
|
||||
|
||||
// empty is ok
|
||||
if (!input && !required) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Number.isInteger(num)) {
|
||||
throw `Input ${id} only accepts numbers. Received ${input}`;
|
||||
}
|
||||
|
||||
return num;
|
||||
}
|
||||
|
||||
export function getInputBoolean(id: string): boolean {
|
||||
const input = getInput(id);
|
||||
|
||||
if (!['true', 'false'].includes(input.toLowerCase())) {
|
||||
throw `Input ${id} only accepts boolean values. Received ${input}`;
|
||||
}
|
||||
return input.toLowerCase() === 'true';
|
||||
}
|
||||
|
||||
export async function validateInputs(inputs: Inputs) {
|
||||
if (
|
||||
(!inputs.timeout_minutes && !inputs.timeout_seconds) ||
|
||||
(inputs.timeout_minutes && inputs.timeout_seconds)
|
||||
) {
|
||||
throw new Error('Must specify either timeout_minutes or timeout_seconds inputs');
|
||||
}
|
||||
}
|
||||
|
||||
export function getTimeout(inputs: Inputs): number {
|
||||
if (inputs.timeout_minutes) {
|
||||
return ms.minutes(inputs.timeout_minutes);
|
||||
} else if (inputs.timeout_seconds) {
|
||||
return ms.seconds(inputs.timeout_seconds);
|
||||
}
|
||||
|
||||
throw new Error('Must specify either timeout_minutes or timeout_seconds inputs');
|
||||
}
|
||||
|
||||
export function getInputs(): Inputs {
|
||||
const timeout_minutes = getInputNumber('timeout_minutes', false);
|
||||
const timeout_seconds = getInputNumber('timeout_seconds', false);
|
||||
const max_attempts = getInputNumber('max_attempts', true) || 3;
|
||||
const command = getInput('command', { required: true });
|
||||
const retry_wait_seconds = getInputNumber('retry_wait_seconds', false) || 10;
|
||||
const shell = getInput('shell');
|
||||
const polling_interval_seconds = getInputNumber('polling_interval_seconds', false) || 1;
|
||||
const retry_on = getInput('retry_on') || 'any';
|
||||
const warning_on_retry = getInput('warning_on_retry').toLowerCase() === 'true';
|
||||
const on_retry_command = getInput('on_retry_command');
|
||||
const continue_on_error = getInputBoolean('continue_on_error');
|
||||
const new_command_on_retry = getInput('new_command_on_retry');
|
||||
const retry_on_exit_code = getInputNumber('retry_on_exit_code', false);
|
||||
|
||||
return {
|
||||
timeout_minutes,
|
||||
timeout_seconds,
|
||||
max_attempts,
|
||||
command,
|
||||
retry_wait_seconds,
|
||||
shell,
|
||||
polling_interval_seconds,
|
||||
retry_on,
|
||||
warning_on_retry,
|
||||
on_retry_command,
|
||||
continue_on_error,
|
||||
new_command_on_retry,
|
||||
retry_on_exit_code,
|
||||
};
|
||||
}
|
||||
12
.github/actions/retry-action/src/util.ts
vendored
Normal file
12
.github/actions/retry-action/src/util.ts
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
import { debug } from '@actions/core';
|
||||
|
||||
export async function wait(ms: number) {
|
||||
return new Promise((r) => setTimeout(r, ms));
|
||||
}
|
||||
|
||||
export async function retryWait(retryWaitSeconds: number) {
|
||||
const waitStart = Date.now();
|
||||
await wait(retryWaitSeconds);
|
||||
debug(`Waited ${Date.now() - waitStart}ms`);
|
||||
debug(`Configured wait: ${retryWaitSeconds}ms`);
|
||||
}
|
||||
16
.github/actions/retry-action/tsconfig.json
vendored
Normal file
16
.github/actions/retry-action/tsconfig.json
vendored
Normal file
@ -0,0 +1,16 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
/* Basic Options */
|
||||
"target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
|
||||
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
|
||||
"noEmit": true /* Do not emit outputs. */,
|
||||
|
||||
/* Strict Type-Checking Options */
|
||||
"strict": true /* Enable all strict type-checking options. */,
|
||||
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
|
||||
|
||||
/* Advanced Options */
|
||||
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
|
||||
},
|
||||
"exclude": ["**/__tests__", "**/__mocks__"]
|
||||
}
|
||||
522
.github/workflows/ci.yml
vendored
522
.github/workflows/ci.yml
vendored
@ -1,5 +1,11 @@
|
||||
name: poco-ci
|
||||
on: [push, pull_request]
|
||||
# To enable retrying a job on failure or a specific timeout, instead of the run step, use uses: nick-fields/retry@v2.9.0(see the linux-gcc-make-tsan jsob)
|
||||
# To retry only on timeout set retry_on: timeout
|
||||
# To retry only on error set retry_on: error
|
||||
# For more information on the retry action see https://github.com/nick-fields/retry
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened]
|
||||
push:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
@ -7,24 +13,19 @@ concurrency:
|
||||
jobs:
|
||||
linux-gcc-make:
|
||||
runs-on: ubuntu-22.04
|
||||
services:
|
||||
mysql:
|
||||
image: mysql:latest
|
||||
env:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
||||
MYSQL_USER: pocotest
|
||||
MYSQL_PASSWORD: pocotest
|
||||
MYSQL_DATABASE: pocotest
|
||||
ports:
|
||||
- 3306:3306
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev
|
||||
- run: ./configure --everything --omit=PDF && make all -s -j4 && sudo make install
|
||||
- run: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-cxx20:
|
||||
runs-on: ubuntu-22.04
|
||||
@ -32,31 +33,31 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev
|
||||
- run: ./configure --config=Linux-c++20 --everything --omit=PDF && make all -s -j4 && sudo make install
|
||||
- run: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-asan:
|
||||
runs-on: ubuntu-22.04
|
||||
services:
|
||||
mysql:
|
||||
image: mysql:latest
|
||||
env:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
||||
MYSQL_USER: pocotest
|
||||
MYSQL_PASSWORD: pocotest
|
||||
MYSQL_DATABASE: pocotest
|
||||
ports:
|
||||
- 3306:3306
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
|
||||
- run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install
|
||||
- run: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL Data/MySQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-asan-no-soo:
|
||||
runs-on: ubuntu-22.04
|
||||
@ -64,10 +65,15 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
|
||||
- run: ./configure --everything --no-samples --omit=PDF --no-soo && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install
|
||||
- run: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-ubsan:
|
||||
runs-on: ubuntu-22.04
|
||||
@ -75,10 +81,15 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
|
||||
- run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=undefined && sudo make install
|
||||
- run: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB"
|
||||
./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-tsan:
|
||||
runs-on: ubuntu-22.04
|
||||
@ -86,9 +97,14 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server
|
||||
- run: ./configure --everything --no-samples --omit=CppParser,Encodings,Data/MySQL,Data/ODBC,Data/PostgreSQL,MongoDB,PageCompiler,PDF,PocoDoc,ProGen,Redis,SevenZip && make all -s -j4 SANITIZEFLAGS=-fsanitize=thread && sudo make install
|
||||
- run: >-
|
||||
sudo -s
|
||||
./ci/runtests.sh TSAN
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
./ci/runtests.sh TSAN
|
||||
|
||||
linux-gcc-cmake:
|
||||
runs-on: ubuntu-22.04
|
||||
@ -96,11 +112,16 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server
|
||||
- run: cmake -H. -Bcmake-build -GNinja -DENABLE_PDF=OFF -DENABLE_TESTS=ON && cmake --build cmake-build --target all
|
||||
- run: >-
|
||||
cd cmake-build &&
|
||||
sudo -s
|
||||
PWD=`pwd`
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)"
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
cd cmake-build &&
|
||||
sudo -s
|
||||
PWD=`pwd`
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)"
|
||||
|
||||
linux-gcc-make-cross-armhf:
|
||||
runs-on: ubuntu-22.04
|
||||
@ -109,9 +130,14 @@ jobs:
|
||||
- run: >-
|
||||
sudo apt-get -y update &&
|
||||
sudo apt-get -y install crossbuild-essential-armhf
|
||||
- run: >-
|
||||
./configure --config=ARM-Linux --everything --omit=PDF,Crypto,NetSSL_OpenSSL,JWT,Data/MySQL,Data/ODBC,Data/PostgreSQL,PageCompiler,PageCompiler/File2Page &&
|
||||
make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
./configure --config=ARM-Linux --everything --omit=PDF,Crypto,NetSSL_OpenSSL,JWT,Data/MySQL,Data/ODBC,Data/PostgreSQL,PageCompiler,PageCompiler/File2Page &&
|
||||
make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf
|
||||
|
||||
macos-clang-make:
|
||||
runs-on: macos-12
|
||||
@ -123,18 +149,23 @@ jobs:
|
||||
--odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib
|
||||
--mysql-include=/usr/local/opt/mysql-client/include --mysql-lib=/usr/local/opt/mysql-client/lib &&
|
||||
make all -s -j4
|
||||
- run: >-
|
||||
sudo -s
|
||||
CPPUNIT_IGNORE="
|
||||
CppUnit::TestCaller<ThreadTest>.testTrySleep,
|
||||
CppUnit::TestCaller<TimestampTest>.testTimestamp,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<SyslogTest>.testOldBSD"
|
||||
EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF"
|
||||
./ci/runtests.sh
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
CPPUNIT_IGNORE="
|
||||
CppUnit::TestCaller<ThreadTest>.testTrySleep,
|
||||
CppUnit::TestCaller<TimestampTest>.testTimestamp,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<SyslogTest>.testOldBSD"
|
||||
EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF"
|
||||
./ci/runtests.sh
|
||||
|
||||
macos-clang-cmake:
|
||||
runs-on: macos-12
|
||||
@ -142,19 +173,24 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: brew install openssl@1.1 mysql-client unixodbc libpq
|
||||
- run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all
|
||||
- run: >-
|
||||
cd cmake-build &&
|
||||
sudo -s
|
||||
CPPUNIT_IGNORE="
|
||||
CppUnit::TestCaller<ThreadTest>.testTrySleep,
|
||||
CppUnit::TestCaller<TimestampTest>.testTimestamp,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<PollSetTest>.testPollClosedServer"
|
||||
PWD=`pwd`
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
cd cmake-build &&
|
||||
sudo -s
|
||||
CPPUNIT_IGNORE="
|
||||
CppUnit::TestCaller<ThreadTest>.testTrySleep,
|
||||
CppUnit::TestCaller<TimestampTest>.testTimestamp,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<PollSetTest>.testPollClosedServer"
|
||||
PWD=`pwd`
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
|
||||
|
||||
macos-clang-cmake-openssl3:
|
||||
runs-on: macos-12
|
||||
@ -162,54 +198,69 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: brew install openssl@3 mysql-client unixodbc libpq
|
||||
- run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all
|
||||
- run: >-
|
||||
cd cmake-build &&
|
||||
sudo -s
|
||||
CPPUNIT_IGNORE="
|
||||
CppUnit::TestCaller<ThreadTest>.testTrySleep,
|
||||
CppUnit::TestCaller<TimestampTest>.testTimestamp,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<PollSetTest>.testPollClosedServer"
|
||||
PWD=`pwd`
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
cd cmake-build &&
|
||||
sudo -s
|
||||
CPPUNIT_IGNORE="
|
||||
CppUnit::TestCaller<ThreadTest>.testTrySleep,
|
||||
CppUnit::TestCaller<TimestampTest>.testTimestamp,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
|
||||
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
|
||||
CppUnit::TestCaller<PollSetTest>.testPollClosedServer"
|
||||
PWD=`pwd`
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
|
||||
|
||||
windows-2019-msvc-cmake:
|
||||
runs-on: windows-2019
|
||||
env:
|
||||
CPPUNIT_IGNORE: >-
|
||||
class CppUnit::TestCaller<class PathTest>.testFind,
|
||||
class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,
|
||||
class CppUnit::TestCaller<class ICMPClientTest>.testPing,
|
||||
class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,
|
||||
class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,
|
||||
class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,
|
||||
class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy,
|
||||
class CppUnit::TestCaller<class PollSetTest>.testPollClosedServer
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON
|
||||
- run: cmake --build cmake-build --config Release
|
||||
- run: >-
|
||||
cd cmake-build;
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release
|
||||
# windows-2019-msvc-cmake:
|
||||
# runs-on: windows-2019
|
||||
# env:
|
||||
# CPPUNIT_IGNORE: >-
|
||||
# class CppUnit::TestCaller<class PathTest>.testFind,
|
||||
# class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,
|
||||
# class CppUnit::TestCaller<class ICMPClientTest>.testPing,
|
||||
# class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,
|
||||
# class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,
|
||||
# class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,
|
||||
# class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy,
|
||||
# class CppUnit::TestCaller<class PollSetTest>.testPollClosedServer
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON
|
||||
# - run: cmake --build cmake-build --config Release
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# cd cmake-build;
|
||||
# ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release
|
||||
|
||||
windows-2019-msvc-buildwin-x64:
|
||||
runs-on: windows-2019
|
||||
env:
|
||||
CPPUNIT_IGNORE: >-
|
||||
class CppUnit::TestCaller<class PathTest>.testFind,
|
||||
class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,
|
||||
class CppUnit::TestCaller<class ICMPClientTest>.testPing,
|
||||
class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,
|
||||
class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,
|
||||
class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,
|
||||
class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: .\buildwin.ps1 -poco_base . -vs 160 -action build -linkmode all -config release -platform x64 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
# windows-2019-msvc-buildwin-x64:
|
||||
# runs-on: windows-2019
|
||||
# env:
|
||||
# CPPUNIT_IGNORE: >-
|
||||
# class CppUnit::TestCaller<class PathTest>.testFind,
|
||||
# class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,
|
||||
# class CppUnit::TestCaller<class ICMPClientTest>.testPing,
|
||||
# class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,
|
||||
# class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,
|
||||
# class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,
|
||||
# class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: .\buildwin.ps1 -poco_base . -vs 160 -action build -linkmode all -config release -platform x64 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
|
||||
# windows-2019-msvc-buildwin-win32:
|
||||
# runs-on: windows-2019
|
||||
@ -217,7 +268,12 @@ jobs:
|
||||
# CPPUNIT_IGNORE: class CppUnit::TestCaller<class PathTest>.testFind,class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,class CppUnit::TestCaller<class ICMPClientTest>.testPing,class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: .\buildwin.ps1 -poco_base . -vs 160 -action build -linkmode all -config release -platform Win32 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: .\buildwin.ps1 -poco_base . -vs 160 -action build -linkmode all -config release -platform Win32 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
|
||||
windows-2022-msvc-buildwin-x64:
|
||||
runs-on: windows-2022
|
||||
@ -232,7 +288,12 @@ jobs:
|
||||
class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform x64 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform x64 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
|
||||
# windows-2022-msvc-buildwin-win32:
|
||||
# runs-on: windows-2022
|
||||
@ -247,7 +308,12 @@ jobs:
|
||||
# class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform Win32 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform Win32 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
|
||||
|
||||
windows-2022-msvc-cmake:
|
||||
runs-on: windows-2022
|
||||
@ -264,9 +330,14 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON
|
||||
- run: cmake --build cmake-build --config Release
|
||||
- run: >-
|
||||
cd cmake-build;
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
cd cmake-build;
|
||||
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release
|
||||
|
||||
# missing asan dll path
|
||||
# windows-2022-msvc-cmake-asan:
|
||||
@ -284,6 +355,195 @@ jobs:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: cmake -S. -Bcmake-build -DPOCO_SANITIZE_ASAN=ON -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON
|
||||
# - run: cmake --build cmake-build --config Debug
|
||||
# - run: >-
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# cd cmake-build;
|
||||
# ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Debug
|
||||
|
||||
linux-gcc-make-mysql:
|
||||
runs-on: ubuntu-22.04
|
||||
services:
|
||||
mysql:
|
||||
image: mysql:8.1.0
|
||||
env:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
||||
MYSQL_USER: pocotest
|
||||
MYSQL_PASSWORD: pocotest
|
||||
MYSQL_DATABASE: pocotest
|
||||
ports:
|
||||
- 3306:3306
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev mysql-client
|
||||
- run: ./configure --everything --no-samples --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/PostgreSQL,Data/SQLite,Encodings,JSON,JWT,MongoDB,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,Redis,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/PostgreSQL Data/ODBC Data/SQLite Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
./ci/runtests.sh
|
||||
# TODO ODBC tests connect to database and hang
|
||||
# - run: |
|
||||
# wget https://dev.mysql.com/get/Downloads/Connector-ODBC/8.2/mysql-connector-odbc_8.2.0-1ubuntu22.04_amd64.deb
|
||||
# wget https://dev.mysql.com/get/Downloads/MySQL-8.2/mysql-community-client-plugins_8.2.0-1ubuntu22.04_amd64.deb
|
||||
# sudo dpkg -i mysql-community-client-plugins_8.2.0-1ubuntu22.04_amd64.deb mysql-connector-odbc_8.2.0-1ubuntu22.04_amd64.deb
|
||||
# - run: mysql -h 127.0.0.1 -u pocotest --password=pocotest -e "DROP DATABASE pocotest; CREATE DATABASE pocotest"
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# sudo -s
|
||||
# EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/PostgreSQL Data/MySQL Data/SQLite Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
# ./ci/runtests.sh
|
||||
|
||||
# TODO tests sometimes failling on testTransaction and testReconnect
|
||||
# linux-gcc-make-postgres:
|
||||
# runs-on: ubuntu-22.04
|
||||
# services:
|
||||
# postgres:
|
||||
# image: postgres:16.0
|
||||
# env:
|
||||
# POSTGRES_PASSWORD: postgres
|
||||
# ports:
|
||||
# - 5432:5432
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev odbc-postgresql
|
||||
# - run: ./configure --everything --no-samples --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/MySQL,Data/SQLite,Encodings,JSON,JWT,MongoDB,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,Redis,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# sudo -s
|
||||
# EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/ODBC Data/MySQL Data/SQLite Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
# ./ci/runtests.sh
|
||||
# - run: |
|
||||
# sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
|
||||
# wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
|
||||
# sudo apt -y update
|
||||
# sudo apt -y install postgresql-client-12
|
||||
# - run: PGPASSWORD=postgres psql -h localhost --username=postgres -d template1 -c 'DROP DATABASE postgres' -c 'CREATE DATABASE postgres'
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# sudo -s
|
||||
# EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/PostgreSQL Data/MySQL Data/SQLite Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
# ./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-redis:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev
|
||||
- run: |
|
||||
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
|
||||
echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
|
||||
sudo apt-get -y update
|
||||
sudo apt-get -y install redis
|
||||
- run: ./configure --everything --no-samples --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL,Encodings,JSON,JWT,MongoDB,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/ODBC Data/MySQL Data/SQLite Data/PostgreSQL Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus SevenZip Util XML Zip"
|
||||
./ci/runtests.sh
|
||||
|
||||
linux-gcc-make-mongodb:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: supercharge/mongodb-github-action@1.10.0
|
||||
- run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev
|
||||
- run: ./configure --everything --no-samples --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL,Encodings,JSON,JWT,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,Redis,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install
|
||||
- uses: ./.github/actions/retry-action
|
||||
with:
|
||||
timeout_minutes: 90
|
||||
max_attempts: 3
|
||||
retry_on: any
|
||||
command: >-
|
||||
sudo -s
|
||||
EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/ODBC Data/MySQL Data/SQLite Data/PostgreSQL Encodings Foundation JSON JWT Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
./ci/runtests.sh
|
||||
|
||||
# TODO Tests keep failing at testCursorStoredProcedure
|
||||
# linux-gcc-make-oracle:
|
||||
# runs-on: ubuntu-22.04
|
||||
# services:
|
||||
# oracle:
|
||||
# image: container-registry.oracle.com/database/express:21.3.0-xe
|
||||
# env:
|
||||
# ORACLE_PWD: poco
|
||||
# ports:
|
||||
# - 1521:1521
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev alien libaio1
|
||||
# - run: |
|
||||
# wget https://download.oracle.com/otn_software/linux/instantclient/2112000/oracle-instantclient-basic-21.12.0.0.0-1.x86_64.rpm
|
||||
# wget https://download.oracle.com/otn_software/linux/instantclient/2112000/oracle-instantclient-sqlplus-21.12.0.0.0-1.x86_64.rpm
|
||||
# wget https://download.oracle.com/otn_software/linux/instantclient/2112000/oracle-instantclient-odbc-21.12.0.0.0-1.x86_64.rpm
|
||||
# sudo alien --scripts ./oracle-instantclient-basic-21.12.0.0.0-1.x86_64.rpm
|
||||
# sudo alien --scripts ./oracle-instantclient-sqlplus-21.12.0.0.0-1.x86_64.rpm
|
||||
# sudo alien --scripts ./oracle-instantclient-odbc-21.12.0.0.0-1.x86_64.rpm
|
||||
# sudo apt install ./oracle-instantclient-basic_21.12.0.0.0-2_amd64.deb
|
||||
# sudo apt install ./oracle-instantclient-sqlplus_21.12.0.0.0-2_amd64.deb
|
||||
# sudo apt install ./oracle-instantclient-odbc_21.12.0.0.0-2_amd64.deb
|
||||
# sudo /usr/lib/oracle/21/client64/bin/odbc_update_ini.sh / "/usr/lib/oracle/21/client64/lib" "" "" "/etc/odbc.ini"
|
||||
# - run: ./configure --everything --no-samples --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/MySQL,Data/SQLite,Data/PostgreSQL,Encodings,JSON,JWT,MongoDB,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,Redis,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# sudo -s
|
||||
# EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/MySQL Data/SQLite Data/PostgreSQL Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
# ./ci/runtests.sh
|
||||
# TODO multiple tests are failling(testStoredProcedure, testBulkPerformance, testBulk,testBareboneODBC)
|
||||
# linux-gcc-make-sqlserver:
|
||||
# runs-on: ubuntu-22.04
|
||||
# services:
|
||||
# sqlserver:
|
||||
# image: mcr.microsoft.com/mssql/server:2022-latest
|
||||
# env:
|
||||
# MSSQL_PID: Express
|
||||
# ACCEPT_EULA: Y
|
||||
# MSSQL_SA_PASSWORD: Pocopoco1
|
||||
# ports:
|
||||
# - 1433:1433
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev gnupg2 curl
|
||||
# - run: |
|
||||
# curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
|
||||
# curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
|
||||
# sudo apt-get update
|
||||
# sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
|
||||
# - run: ./configure --everything --no-samples --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/MySQL,Data/SQLite,Data/PostgreSQL,Encodings,JSON,JWT,MongoDB,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,Redis,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install
|
||||
# - uses: ./.github/actions/retry-action
|
||||
# with:
|
||||
# timeout_minutes: 90
|
||||
# max_attempts: 3
|
||||
# retry_on: any
|
||||
# command: >-
|
||||
# sudo -s
|
||||
# EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/MySQL Data/SQLite Data/PostgreSQL Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip"
|
||||
# ./ci/runtests.sh
|
||||
|
||||
11
.github/workflows/codeql.yml
vendored
11
.github/workflows/codeql.yml
vendored
@ -120,7 +120,10 @@ jobs:
|
||||
path: ${{ steps.step1.outputs.sarif-output }}
|
||||
retention-days: 5
|
||||
|
||||
- name: Fail if an error is found
|
||||
run: |
|
||||
./.github/workflows/fail_on_error.py \
|
||||
${{ steps.step1.outputs.sarif-output }}/cpp.sarif
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v4
|
||||
|
||||
# - name: Fail if an error is found
|
||||
# run: |
|
||||
# python ./.github/workflows/fail_on_error.py \
|
||||
# ${{ steps.step1.outputs.sarif-output }}/cpp.sarif
|
||||
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@ -152,3 +152,8 @@ poco_build_stderr.out
|
||||
*.swp
|
||||
*.vim
|
||||
tags
|
||||
|
||||
# Javascript #
|
||||
##############
|
||||
package-lock.json
|
||||
node_modules
|
||||
|
||||
@ -38,13 +38,13 @@ using Poco::Tuple;
|
||||
using Poco::NotFoundException;
|
||||
|
||||
|
||||
#define MYSQL_ODBC_DRIVER "MySQL ODBC 5.3 Unicode Driver"
|
||||
#define MYSQL_ODBC_DRIVER "MySQL ODBC 8.2 Unicode Driver"
|
||||
#define MYSQL_DSN "PocoDataMySQLTest"
|
||||
#define MYSQL_SERVER POCO_ODBC_TEST_DATABASE_SERVER
|
||||
#define MYSQL_DB "test"
|
||||
#define MYSQL_UID "root"
|
||||
#define MYSQL_PWD "poco"
|
||||
#define MYSQL_DB "test"
|
||||
#define MYSQL_DB "pocotest"
|
||||
#define MYSQL_UID "pocotest"
|
||||
#define MYSQL_PWD "pocotest"
|
||||
#define MYSQL_DB "pocotest"
|
||||
|
||||
|
||||
ODBCTest::SessionPtr ODBCMySQLTest::_pSession;
|
||||
|
||||
@ -41,12 +41,12 @@ using Poco::DynamicAny;
|
||||
using Poco::DateTime;
|
||||
|
||||
|
||||
#define ORACLE_ODBC_DRIVER "Oracle in XE"
|
||||
#define ORACLE_ODBC_DRIVER "Oracle 21 ODBC driver"
|
||||
#define ORACLE_DSN "PocoDataOracleTest"
|
||||
#define ORACLE_SERVER POCO_ODBC_TEST_DATABASE_SERVER
|
||||
#define ORACLE_PORT "1521"
|
||||
#define ORACLE_SID "XE"
|
||||
#define ORACLE_UID "poco"
|
||||
#define ORACLE_UID "SYSTEM"
|
||||
#define ORACLE_PWD "poco"
|
||||
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ using Poco::DateTime;
|
||||
#define POSTGRESQL_DSN "PocoDataPgSQLTestW"
|
||||
#else
|
||||
#ifdef POCO_PTR_IS_64_BIT
|
||||
#define POSTGRESQL_ODBC_DRIVER "PostgreSQL ANSI(x64)"
|
||||
#define POSTGRESQL_ODBC_DRIVER "PostgreSQL ANSI"
|
||||
#else
|
||||
#define POSTGRESQL_ODBC_DRIVER "PostgreSQL ANSI"
|
||||
#endif
|
||||
@ -59,8 +59,8 @@ using Poco::DateTime;
|
||||
#define POSTGRESQL_PORT "5432"
|
||||
#define POSTGRESQL_DB "postgres"
|
||||
#define POSTGRESQL_UID "postgres"
|
||||
#define POSTGRESQL_PWD "poco"
|
||||
#define POSTGRESQL_VERSION "10"
|
||||
#define POSTGRESQL_PWD "postgres"
|
||||
#define POSTGRESQL_VERSION "16"
|
||||
|
||||
#ifdef POCO_OS_FAMILY_WINDOWS
|
||||
const std::string ODBCPostgreSQLTest::_libDir = "C:\\\\Program Files\\\\PostgreSQL\\\\pg" POSTGRESQL_VERSION "\\\\lib\\\\";
|
||||
|
||||
@ -68,9 +68,9 @@ using Poco::DateTime;
|
||||
#define MS_SQL_SERVER_DSN "PocoDataSQLServerTest"
|
||||
#define MS_SQL_SERVER_SERVER POCO_ODBC_TEST_DATABASE_SERVER
|
||||
#define MS_SQL_SERVER_PORT "1433"
|
||||
#define MS_SQL_SERVER_DB "poco"
|
||||
#define MS_SQL_SERVER_UID "poco"
|
||||
#define MS_SQL_SERVER_PWD "poco"
|
||||
#define MS_SQL_SERVER_DB "model"
|
||||
#define MS_SQL_SERVER_UID "sa"
|
||||
#define MS_SQL_SERVER_PWD "Pocopoco1"
|
||||
|
||||
|
||||
ODBCTest::SessionPtr ODBCSQLServerTest::_pSession;
|
||||
@ -88,6 +88,7 @@ std::string ODBCSQLServerTest::_connectString = "DRIVER=" MS_SQL_SERVER_ODBC_DRI
|
||||
"DATABASE=" MS_SQL_SERVER_DB ";"
|
||||
"SERVER=" MS_SQL_SERVER_SERVER ";"
|
||||
"PORT=" MS_SQL_SERVER_PORT ";"
|
||||
"TrustServerCertificate=yes;"
|
||||
"Encrypt=no"
|
||||
#ifdef FREE_TDS_VERSION
|
||||
"TDS_Version=" FREE_TDS_VERSION ";"
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include "Poco/Thread.h"
|
||||
#include "Poco/Event.h"
|
||||
#include "Poco/AutoPtr.h"
|
||||
#include <iostream>
|
||||
|
||||
|
||||
using Poco::Task;
|
||||
@ -34,20 +35,42 @@ namespace
|
||||
|
||||
void runTask()
|
||||
{
|
||||
_event.wait();
|
||||
if (sleep(10))
|
||||
return;
|
||||
setProgress(0.5);
|
||||
_event.wait();
|
||||
if (isCancelled())
|
||||
return;
|
||||
setProgress(1.0);
|
||||
_event.wait();
|
||||
try
|
||||
{
|
||||
_event.wait();
|
||||
if (sleep(10))
|
||||
return;
|
||||
setProgress(0.5);
|
||||
_event.wait();
|
||||
if (isCancelled())
|
||||
return;
|
||||
setProgress(1.0);
|
||||
_event.wait();
|
||||
}
|
||||
catch(const Poco::Exception& e)
|
||||
{
|
||||
std::cerr << "TestTask::run(): " << e.displayText() << '\n';
|
||||
}
|
||||
catch(const std::exception& e)
|
||||
{
|
||||
std::cerr << "TestTask::run(): " << e.what() << '\n';
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
std::cerr << "TestTask::run(): unknown exception." << '\n';
|
||||
}
|
||||
}
|
||||
|
||||
void cont()
|
||||
{
|
||||
_event.set();
|
||||
try
|
||||
{
|
||||
_event.set();
|
||||
}
|
||||
catch(const Poco::SystemException& e)
|
||||
{
|
||||
std::cerr << "TestTask::cont(): " << e.displayText() << '\n';
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user