From 5c17cdbe13cae16c3dac9f2705a990389a03e0d2 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:28:00 +0200 Subject: [PATCH 1/7] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 22 ---------------------- .github/ISSUE_TEMPLATE/feature_request.md | 20 -------------------- 2 files changed, 42 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 8e4ed0811d5..00000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: bug, needs triage -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. Include the version(s) of DSpace where you've seen this problem & what *web browser* you were using. Link to examples if they are public. - -**To Reproduce** -Steps to reproduce the behavior: -1. Do this -2. Then this... - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Related work** -Link to any related tickets or PRs here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 34cc2c9e4f3..00000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest a new feature for this project -title: '' -labels: new feature, needs triage -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives or workarounds you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. From 1b1cdd7d2699f3c2c7264b65b7312b377907bcd0 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:35:31 +0200 Subject: [PATCH 2/7] Update pull_request_template.md --- .github/pull_request_template.md | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index be15b0a507c..f7fd32d0777 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,20 +1,18 @@ -## References -_Add references/links to any related issues or PRs. These may include:_ -* Fixes #[issue-number] -* Requires DSpace/DSpace#[pr-number] (if a REST API PR is required to test this) - -## Description -Short summary of changes (1-2 sentences). - -## Instructions for Reviewers -Please add a more detailed description of the changes made by your PR. At a minimum, providing a bulleted list of changes in your PR is helpful to reviewers. - -List of changes in this PR: -* First, ... -* Second, ... - -**Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. - +| Phases | JH | JP | TM | JM | Total | +|-----------------|----:|----:|-----:|-----:|-------:| +| ETA | 0 | 0 | 0 | 0 | 0 | +| Developing | 0 | 0 | 0 | 0 | 0 | +| Review | 0 | 0 | 0 | 0 | 0 | +| Total | - | - | - | - | 0 | +| ETA est. | | | | | 0 | +| ETA cust. | - | - | - | - | 0 | +## Problem description +### Reported issues +### Not-reported issues +## Analysis +(Write here, if there is needed describe some specific problem. Erase it, when it is not needed.) +## Problems +(Write here, if some unexpected problems occur during solving issues. Erase it, when it is not needed.) ## Checklist _This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_ From b2ea1bc6f7d6e9be6e50e217bc30a3e6f4640a98 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:41:15 +0200 Subject: [PATCH 3/7] Update pull_request_template.md --- .github/pull_request_template.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f7fd32d0777..15ddf9dbfb9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,11 +1,11 @@ -| Phases | JH | JP | TM | JM | Total | -|-----------------|----:|----:|-----:|-----:|-------:| -| ETA | 0 | 0 | 0 | 0 | 0 | -| Developing | 0 | 0 | 0 | 0 | 0 | -| Review | 0 | 0 | 0 | 0 | 0 | -| Total | - | - | - | - | 0 | -| ETA est. | | | | | 0 | -| ETA cust. | - | - | - | - | 0 | +| Phases | MM | MB | Total | +|-----------------|----:|----:|-------:| +| ETA | 0 | 0 | 0 | +| Developing | 0 | 0 | 0 | +| Review | 0 | 0 | 0 | +| Total | - | - | 0 | +| ETA est. | | | 0 | +| ETA cust. | - | - | 0 | ## Problem description ### Reported issues ### Not-reported issues From d0fc6ec02a064670f91b2cc8ffa05882b9207d4a Mon Sep 17 00:00:00 2001 From: MajoBerger Date: Thu, 31 Mar 2022 16:45:17 +0200 Subject: [PATCH 4/7] fixed workflow actions --- .../{workflows => disabled-workflows}/issue_opened.yml | 0 .../label_merge_conflicts.yml | 0 .github/workflows/docker.yml | 9 ++++----- 3 files changed, 4 insertions(+), 5 deletions(-) rename .github/{workflows => disabled-workflows}/issue_opened.yml (100%) rename .github/{workflows => disabled-workflows}/label_merge_conflicts.yml (100%) diff --git a/.github/workflows/issue_opened.yml b/.github/disabled-workflows/issue_opened.yml similarity index 100% rename from .github/workflows/issue_opened.yml rename to .github/disabled-workflows/issue_opened.yml diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/disabled-workflows/label_merge_conflicts.yml similarity index 100% rename from .github/workflows/label_merge_conflicts.yml rename to .github/disabled-workflows/label_merge_conflicts.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 00ec2fa8f79..0b514be2678 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,16 +6,15 @@ name: Docker images on: push: branches: - - main - - 'dspace-**' + - dtq-dev tags: - 'dspace-**' pull_request: jobs: docker: - # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular' - if: github.repository == 'dspace/dspace-angular' + # Ensure this job never runs on forked repos. It's only executed for our repo + if: github.repository == 'dataquest-dev/dspace-angular' runs-on: ubuntu-latest env: # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action) @@ -59,7 +58,7 @@ jobs: id: meta_build uses: docker/metadata-action@v3 with: - images: dspace/dspace-angular + images: regreb01/dspace-angular tags: ${{ env.IMAGE_TAGS }} flavor: ${{ env.TAGS_FLAVOR }} From 58b262a44c8f4bc90ba3179144412a9c7de50868 Mon Sep 17 00:00:00 2001 From: MajoBerger Date: Thu, 31 Mar 2022 17:55:33 +0200 Subject: [PATCH 5/7] updated docker destination --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0b514be2678..dc26941fc29 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -58,7 +58,7 @@ jobs: id: meta_build uses: docker/metadata-action@v3 with: - images: regreb01/dspace-angular + images: dataquest/dspace-angular tags: ${{ env.IMAGE_TAGS }} flavor: ${{ env.TAGS_FLAVOR }} From 52355decfb8c490cfa8c338a9f884040544d3519 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Fri, 1 Apr 2022 08:23:33 +0200 Subject: [PATCH 6/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74010f3c5c2..062f93ee266 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://github.com/DSpace/dspace-angular/workflows/Build/badge.svg?branch=main)](https://github.com/DSpace/dspace-angular/actions?query=workflow%3ABuild) [![Coverage Status](https://codecov.io/gh/DSpace/dspace-angular/branch/main/graph/badge.svg)](https://codecov.io/gh/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) +[![Build Status](https://github.com/DSpace/dspace-angular/workflows/Build/badge.svg?branch=dtq-dev)](https://github.com/DSpace/dspace-angular/actions?query=workflow%3ABuild) [![Coverage Status](https://codecov.io/gh/DSpace/dspace-angular/branch/main/graph/badge.svg)](https://codecov.io/gh/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) dspace-angular ============== From 758faaf3545d0fd891e716bfef10f31a7548cef3 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Fri, 1 Apr 2022 08:28:00 +0200 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 062f93ee266..aa0310d5f76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://github.com/DSpace/dspace-angular/workflows/Build/badge.svg?branch=dtq-dev)](https://github.com/DSpace/dspace-angular/actions?query=workflow%3ABuild) [![Coverage Status](https://codecov.io/gh/DSpace/dspace-angular/branch/main/graph/badge.svg)](https://codecov.io/gh/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) +[![Build](https://github.com/dataquest-dev/dspace-angular/actions/workflows/build.yml/badge.svg)](https://github.com/dataquest-dev/dspace-angular/actions/workflows/build.yml) [![Coverage Status](https://codecov.io/gh/DSpace/dspace-angular/branch/main/graph/badge.svg)](https://codecov.io/gh/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) dspace-angular ==============