From 8ae8d9e043d1c36c1f984ea2cfaca391f0cef3ec Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Fri, 2 Dec 2022 13:37:10 +0200 Subject: [PATCH 1/8] Update issue templates Changes in the Skosmos issue templates to help sort bugs and new features --- .github/ISSUE_TEMPLATE/bug_report.md | 17 +++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..41af301cf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,17 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: '' + +--- + +**URL-address of the page (in finto.fi) where you encountered the problem** + +**Description of the problem** +Steps to produce the problem, and the expected outcome after it has been fixed + +**Additional information about the problem** + +**The browser you used when the problem appeared** diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..e337891f5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,18 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' + +--- + +**Description of the enhancement** + +**What new features would the enhancement make possible?** +Or if it would fix a current problem, what is the problem? + +**Who are the users that would benefit from the enhancement?** +For additional context that we can use for creating relevant user stories. + +**Why is the enhancement important?** From 79ab7059c317a8d7dba96b86f1ac154edc38afba Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:13:47 +0200 Subject: [PATCH 2/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 8 ++++---- .github/ISSUE_TEMPLATE/feature_request.md | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 41af301cf..6c02a4e06 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,11 +7,11 @@ assignees: '' --- -**URL-address of the page (in finto.fi) where you encountered the problem** +## URL address of the page where you encountered the problem -**Description of the problem** +## Description of the problem Steps to produce the problem, and the expected outcome after it has been fixed -**Additional information about the problem** +## Additional information about the problem -**The browser you used when the problem appeared** +## The browser you used when the problem appeared diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index e337891f5..b428b44b7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,12 +7,12 @@ assignees: '' --- -**Description of the enhancement** +## Description of the enhancement -**What new features would the enhancement make possible?** +## What new features would the enhancement make possible? Or if it would fix a current problem, what is the problem? -**Who are the users that would benefit from the enhancement?** -For additional context that we can use for creating relevant user stories. +## Who are the users that would benefit from the enhancement? +For additional context that we can use for creating relevant user stories -**Why is the enhancement important?** +## Why is the enhancement important? From 54e29cee0cedfbdfafb4740fc5440956258604b3 Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:19:18 +0200 Subject: [PATCH 3/8] Update feature request template --- .github/ISSUE_TEMPLATE/feature_request.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index b428b44b7..242f63e19 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -9,10 +9,11 @@ assignees: '' ## Description of the enhancement +## Who are the users that would benefit from the enhancement and how? +For additional context that we can use for creating relevant user stories + ## What new features would the enhancement make possible? Or if it would fix a current problem, what is the problem? -## Who are the users that would benefit from the enhancement? -For additional context that we can use for creating relevant user stories - ## Why is the enhancement important? + From 271862b601e21cbeb605343a60375c13e3050924 Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:22:48 +0200 Subject: [PATCH 4/8] Update feature request template --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 242f63e19..a6bc4f196 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -12,7 +12,7 @@ assignees: '' ## Who are the users that would benefit from the enhancement and how? For additional context that we can use for creating relevant user stories -## What new features would the enhancement make possible? +## What new functionalities would the enhancement make possible? Or if it would fix a current problem, what is the problem? ## Why is the enhancement important? From e3591511b127a8542a1848375d3155f699de5db8 Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:37:12 +0200 Subject: [PATCH 5/8] Update feature request template --- .github/ISSUE_TEMPLATE/feature_request.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index a6bc4f196..65fa94957 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -10,10 +10,7 @@ assignees: '' ## Description of the enhancement ## Who are the users that would benefit from the enhancement and how? -For additional context that we can use for creating relevant user stories ## What new functionalities would the enhancement make possible? -Or if it would fix a current problem, what is the problem? ## Why is the enhancement important? - From 37621aeb82886f0d6781866fb70895b2e3464db6 Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:40:30 +0200 Subject: [PATCH 6/8] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6c02a4e06..33de897a1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,6 +12,6 @@ assignees: '' ## Description of the problem Steps to produce the problem, and the expected outcome after it has been fixed -## Additional information about the problem +## Additional information (e.g. screenshots) about the problem ## The browser you used when the problem appeared From 538b246b442c9293eccc5710fd1be51095f64285 Mon Sep 17 00:00:00 2001 From: joelit <578627+joelit@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:49:43 +0200 Subject: [PATCH 7/8] Delete ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index c8efe59b4..000000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,10 +0,0 @@ -## At which URL did you encounter the problem? - -## What steps will reproduce the problem? -1. -2. -3. - -## What is the expected output? What do you see instead? - -## What browser did you use? (eg. Firefox, Chrome, Safari, Internet explorer) From ba237a14bb35a5e7f2097a2f37aea67946be12c5 Mon Sep 17 00:00:00 2001 From: Vaara Mika Date: Thu, 15 Dec 2022 15:03:53 +0200 Subject: [PATCH 8/8] Fix running git commands in CI tests under GitHub Actions. Fixes #1394 --- tests/bootstrap.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index e5e54e6bb..f434a4458 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -9,5 +9,12 @@ putenv('SKOSMOS_SPARQL_ENDPOINT=http://localhost:13030/skosmos-test/sparql'); } +# Allow running git commands in the php-actions/phpunit container +# (prevent "dubious ownership" error; /app is owned by another user, not root) +if (getenv('GITHUB_ACTIONS') === 'true' ) { + mkdir('/home/runner'); + exec('git config --global --add safe.directory /app'); +} + require_once(__DIR__ . '/../vendor/autoload.php'); require_once(__DIR__ . '/../model/Model.php');