Skip to content

Commit

Permalink
Revert "Merge branch 'staging' into develop"
Browse files Browse the repository at this point in the history
This reverts commit 3c8c9c6, reversing
changes made to 2f3b26f.
  • Loading branch information
BEdev24 committed Dec 17, 2024
1 parent 3c8c9c6 commit 1cc4246
Show file tree
Hide file tree
Showing 32 changed files with 388 additions and 691 deletions.
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Bug report
about: You might have found a bug and decide to report it
title: ''
labels: 'bug :bug:'
assignees: ''
---

## Context & versions
<!-- Explain your setup and what versions have been used. -->

## Steps to reproduce
<!--
1. Prepared x
2. Started y
3. Submitted z
If not reproducible, describe the steps you took as you remember it.
-->

## Actual behavior
<!-- A description of the (reproducible) outcome. -->

## Expected behavior
<!-- A description of what you expect to happen instead. -->
68 changes: 0 additions & 68 deletions .github/ISSUE_TEMPLATE/bug_report.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
blank_issues_enabled: true
contact_links:
- name: Contributing guidelines
url: https://github.com/IntersectMBO/cc-portal/blob/master/CONTRIBUTING.md
url: https://github.com/IntersectMBO/xxxx/blob/master/CONTRIBUTING.md
about: Some rules & processes we honor.

- name: Feature ideas
url: https://github.com/IntersectMBO/cc-portal/discussions/categories/ideas
url: https://github.com/IntersectMBO/xxxx/discussions/categories/ideas
about: Maybe someone else had the same or a similar idea already?

- name: All issues
url: https://github.com/IntersectMBO/cc-portal/issues
url: https://github.com/IntersectMBO/xxxx/issues
about: Check whether your issue is not already covered here.
67 changes: 19 additions & 48 deletions .github/ISSUE_TEMPLATE/feature_idea.yml
Original file line number Diff line number Diff line change
@@ -1,73 +1,44 @@
name: 💡 Feature idea
description: Idea or request for some feature on the CC Portal roadmap
title: "💡 "
labels: ["💡 Feature idea"]
projects: ["IntersectMBO/24", "IntersectMBO/34"]
name: Feature idea
description: Idea or request for some feature on the xxxx roadmap
labels: [':thought_balloon: idea']
body:
- type: markdown
attributes:
value:
value: |
## 🌟 **Thank you for contributing to Constitutional Committee Portal!**
- type: markdown
attributes:
value: |
Before submitting a new issue consider [starting a new discussion](https://github.com/IntersectMBO/cc-portal/discussions/new?category=ideas).
**Thank you for contributing to our project!** :green_heart:
- type: dropdown
id: design-needed
attributes:
label: Is there new design needed?
description: Will this feature require new or edit to existing frontend designs?
options:
- 'Yes'
- 'No'
- Not sure
validations:
required: true
Instead of opening this issue, consider [starting a new idea discussion](https://github.com/IntersectMBO/xxxx/discussions/new?category=ideas).
That way, we can discuss & refine your idea together, before we adopt it as a feature into the roadmap.
- type: textarea
id: what
id: why
attributes:
label: What?
description: What is this feature?
label: Why
description: Why do we need or want this feature
placeholder: |
For example describe a new API endpoint, a change in wording,
a new configuration option, ...
Give context and describe the problem, challenge or opportunity you see
validations:
required: true

- type: textarea
id: why
id: what
attributes:
label: Why?
description: Why do we need or want this feature?
label: What
description: What is this feature roughly about
placeholder: |
Give context and describe the problem the idea solves
For example describe a new API endpoint, a change in messaging formats,
a new configuration option, ...
validations:
required: true

- type: textarea
id: how
attributes:
label: How?
description: How can we realize this feature?
label: How
description: How could we realize this feature
placeholder: |
Which technical solutions, libraries or systems should be used, which
components need to change, steps how to implement this, ...
validations:
required: true

- type: markdown
attributes:
value: |
---
- type: textarea
id: user-story
attributes:
label: (Optional) User Story with acceptance criteria
description: See examples [here](https://github.com/IntersectMBO/cardano-test-plans/blob/main/userStoryInventoryChangHF.md#2g-delegate-to-self-for-registered-dreps).
placeholder: |
As a [ada holder | DRep | Direct voter], I want [some goal] so that [some reason].
validations:
required: false
required: true
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

## Checklist

- [related issue](https://github.com/IntersectMBO/cc-portal/issues/)
- [related issue](https://github.com/IntersectMBO/xxxx/issues/)
- [ ] My changes generate no new warnings
- [ ] My code follows the [style guidelines](https://github.com/IntersectMBO/cc-portal/tree/main/docs/style-guides) of this project
- [ ] My code follows the [style guidelines](https://github.com/IntersectMBO/xxxx/tree/main/docs/style-guides) of this project
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added tests that prove my fix is effective or that my feature works
61 changes: 0 additions & 61 deletions .github/workflows/label-feature-idea.yml

This file was deleted.

28 changes: 15 additions & 13 deletions .github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
- develop
- staging
- beta
- master
- main

permissions:
contents: write
pull-requests: write
packages: write

env:
ENVIRONMENT: ${{ (github.ref_name == 'master' && 'prod-cc-portal') || (github.ref_name == 'beta' && 'pre-prod-cc-portal') || (github.ref_name == 'staging' && 'qa-cc-portal') || (github.ref_name == 'develop' && 'dev-cc-portal') }}
ENVIRONMENT: ${{ (github.ref_name == 'main' && 'prod-cc-portal') || (github.ref_name == 'beta' && 'pre-prod-cc-portal') || (github.ref_name == 'staging' && 'qa-cc-portal') || (github.ref_name == 'develop' && 'dev-cc-portal') }}

jobs:
check-build-deploy:
Expand Down Expand Up @@ -91,6 +91,7 @@ jobs:
set -o pipefail
sudo chmod +x lint.sh && ./lint.sh 2>&1 | tee code_lint_output.txt
- name: Unit tests
id: unit_tests
run: |
Expand Down Expand Up @@ -129,23 +130,22 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache
outputs: type=docker,dest=/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar
build-args: |
NEXT_PUBLIC_API_URL=${{ secrets.QA_NEXT_PUBLIC_API_URL }}
NEXT_PUBLIC_USERSNAP_SPACE_API_KEY=${{ secrets.QA_NEXT_PUBLIC_USERSNAP_SPACE_API_KEY }}
NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.QA_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS=${{ secrets.QA_NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS }}
NEXT_PUBLIC_IS_MAINNET=${{ secrets.QA_NEXT_PUBLIC_IS_MAINNET }}
NEXT_PUBLIC_API_URL=${{ secrets.DEV_NEXT_PUBLIC_API_URL }}
NEXT_PUBLIC_USERSNAP_GLOBAL_API_KEY=${{ secrets.DEV_NEXT_PUBLIC_USERSNAP_GLOBAL_API_KEY }}
NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.DEV_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
- name: Scan Docker image with Dockle
id: dockle
run: |
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
sudo mv dockle /usr/local/bin
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
sudo mv dockle /usr/local/bin
dockle --exit-code 1 --exit-level fatal --format json --input '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
cat ${{ matrix.workdir }}/dockle_scan_output.json
dockle --exit-code 1 --exit-level fatal --format json --input '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
cat ${{ matrix.workdir }}/dockle_scan_output.json
echo "outcome=success" >> $GITHUB_OUTPUT
echo "outcome=success" >> $GITHUB_OUTPUT
- name: Login to GHCR
uses: docker/login-action@v2
Expand All @@ -154,6 +154,7 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}


- name: Push Docker image to GHCR
run: |
docker load -i '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
Expand All @@ -168,6 +169,7 @@ jobs:
message: |-
This PR is in the tag: ${{ env.TAG }} , for ${{ matrix.name }} service
- name: Deploy with Qovery
if: github.ref == 'refs/heads/develop'
env:
Expand Down
Loading

0 comments on commit 1cc4246

Please sign in to comment.