From 8f4e5f8c25335902760e28a897d311071f4ac8ed Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Feb 2021 16:27:30 +0100 Subject: [PATCH 1/3] - updated issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 9 +-------- .github/ISSUE_TEMPLATE/devops_ticket.md | 2 +- .github/ISSUE_TEMPLATE/refactor_tickets.md | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index fbf7173fc..1d2aef77e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,7 +8,6 @@ title: 🐛 [Bug] ## :bug: Bugreport - ### Steps to reproduce the behavior 1. 2. @@ -16,17 +15,11 @@ title: 🐛 [Bug] 4. ... 5. Profit - ### Expected behavior - ### Version & Environment - Type: [] - - OS: [] - - Browser: [] - - Version [] - - Device: [] + ### Additional context diff --git a/.github/ISSUE_TEMPLATE/devops_ticket.md b/.github/ISSUE_TEMPLATE/devops_ticket.md index 6f8ea55cb..77355d1cf 100644 --- a/.github/ISSUE_TEMPLATE/devops_ticket.md +++ b/.github/ISSUE_TEMPLATE/devops_ticket.md @@ -5,7 +5,7 @@ labels: devops title: 💥 [DevOps] --- -## :fire: DevOps ticket +## 💥 DevOps ticket ### Motive diff --git a/.github/ISSUE_TEMPLATE/refactor_tickets.md b/.github/ISSUE_TEMPLATE/refactor_tickets.md index b6c799f67..b595abd5d 100644 --- a/.github/ISSUE_TEMPLATE/refactor_tickets.md +++ b/.github/ISSUE_TEMPLATE/refactor_tickets.md @@ -10,6 +10,7 @@ title: 🔧 [Refactor] ### Motive + ### Related issues From c78cd78d720373202918a8681506f0445c0572e5 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Feb 2021 16:27:48 +0100 Subject: [PATCH 2/3] - removed unused yml files --- .github/semantic.yml | 2 -- .github/stale-disabled.yml | 18 ------------------ 2 files changed, 20 deletions(-) delete mode 100644 .github/semantic.yml delete mode 100644 .github/stale-disabled.yml diff --git a/.github/semantic.yml b/.github/semantic.yml deleted file mode 100644 index 3b523527b..000000000 --- a/.github/semantic.yml +++ /dev/null @@ -1,2 +0,0 @@ -# Always validate the PR title, and ignore the commits -titleOnly: true \ No newline at end of file diff --git a/.github/stale-disabled.yml b/.github/stale-disabled.yml deleted file mode 100644 index 0458d1a5a..000000000 --- a/.github/stale-disabled.yml +++ /dev/null @@ -1,18 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 60 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 30 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned - - security - - bounty -# Label to use when marking an issue as stale -staleLabel: stale -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false From 7d7b3c1af4197ac6022c59a9c056c9948d883690 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Feb 2021 16:29:24 +0100 Subject: [PATCH 3/3] - renanemd ci.yml file to test.yml - we will have more then one workflow in the future - removed clutter from test workflow file --- .github/workflows/{ci.yml => test.yml} | 43 ++------------------------ 1 file changed, 2 insertions(+), 41 deletions(-) rename .github/workflows/{ci.yml => test.yml} (86%) diff --git a/.github/workflows/ci.yml b/.github/workflows/test.yml similarity index 86% rename from .github/workflows/ci.yml rename to .github/workflows/test.yml index 4ebded0dd..276589dc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: ocelot.social CI +name: ocelot.social test CI on: [push] @@ -241,43 +241,4 @@ jobs: run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - name: webapp | Unit tests #run: docker run --rm ocelotsocialnetwork/webapp:build yarn run test - run: docker-compose exec -T webapp yarn test - - ############################################################################## - # JOB: DOCKER BUILD PRODUCTION & PUSH ######################################## - ############################################################################## - #build_production: - # name: Docker Build Production & Push - # runs-on: ubuntu-latest - # needs: prepare - # steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - #- name: Checkout code - # uses: actions/checkout@v2 - ########################################################################## - # BACKEND ################################################################ - ########################################################################## - # TODO: We want to push this to dockerhub - #- name: Build backend production image - # uses: docker/build-push-action@v1.1.0 - # with: - # repository: ocelotsocialnetwork/backend - # tags: production - # target: production - # path: backend/ - # push: false - - ########################################################################## - # WEBAPP ################################################################# - ########################################################################## - # TODO: We want to push this to dockerhub - #- name: Build webapp production image - # uses: docker/build-push-action@v1.1.0 - # with: - # repository: ocelotsocialnetwork/webapp - # tags: production - # target: production - # path: webapp/ - # push: false \ No newline at end of file + run: docker-compose exec -T webapp yarn test \ No newline at end of file