Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/maven/code/api/main/com.atlassian…
Browse files Browse the repository at this point in the history
….jira-jira-api-1000.30.0
  • Loading branch information
RVANDO12 authored Sep 22, 2023
2 parents b307f1f + 0d7e3cb commit 47c0deb
Show file tree
Hide file tree
Showing 927 changed files with 25,068 additions and 28,325 deletions.
Empty file added --member=allUsers
Empty file.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/epic.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Epic
about: An epic is a collection of user stories. It can be used to gather features sharing the same goal (e.g. User login management, Migration, Purchase etc.).
title: Epic
labels: Epic Request
assignees: ''

---

**Description**
What is the epic about ? Feel free to detail as many as you can.

**Features**
- feature 1 (#xx)
- feature 2 (#yy)
- ...

**Additional context**
Add any other context or screenshots about the epic request here or even mockups of screen modifications if you have made any :)
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ assignees: ''

---

**Epic**
The link to the epic, if any: epic x (#xx)

**What it's the actual situation on ARA ?**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] / We can't do ...

Expand Down
2 changes: 2 additions & 0 deletions .github/cr-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
release-notes-file: CHANGELOG.md
release-name-template: "{{ .Name }}-v{{ .Version }}"
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Please make sure your PullRequest respect all those items :
* [ ] If your PR is related to an issue, add the issue's number in it.
* [ ] All the code you added is documented.
* [ ] All the code you added is tested and the tests are in success.
* [ ] You already signed the [Contributor License Agreement](https://github.com/Decathlon/ara/blob/main/doc/contributing/contributor-licence-agreement.adoc) and give us the document
* [ ] You already signed the [Contributor License Agreement](https://cla-assistant.io/Decathlon/ara) and give us the document
1 change: 1 addition & 0 deletions .github/scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruamel.yaml
23 changes: 23 additions & 0 deletions .github/scripts/upgrade-component.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env python

from ruamel.yaml import YAML
import os, sys
from argparse import ArgumentParser

yaml=YAML()

def upgrade_component_version(args):
values_path = os.path.join(args.path, 'values.yaml')
with open(values_path) as stream:
loaded = yaml.load(stream)
loaded[args.component]['image']['tag'] = args.version
with open(values_path, 'wb') as stream:
yaml.dump(loaded, stream)

parser = ArgumentParser(prog='upgrade-component')

parser.add_argument("path", help="chart path")
parser.add_argument("-c", "--component", help="component name under values", required=True)
parser.add_argument("-v", "--version", help="component version")

upgrade_component_version(parser.parse_args())
143 changes: 0 additions & 143 deletions .github/workflows/build-api.yaml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/build-core-api.yaml

This file was deleted.

78 changes: 78 additions & 0 deletions .github/workflows/build-oauth2-dev-server.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: build oauth2-dev-server

on:
push:
branches:
- 'main'
pull_request:
branches:
- main

jobs:
build-oauth2-dev-server:
runs-on: ubuntu-latest
steps:
- id: skip_check
uses: fkirc/[email protected]
with:
paths: '["code/oauth2-dev-server/**", ".github/workflows/build-oauth2-dev-server.yaml"]'
cancel_others: 'true'
skip_after_successful_duplicate: 'false'
do_not_skip: '["workflow_dispatch"]'
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Checkout
uses: actions/checkout@v2
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Install xmllint
run: sudo apt-get update && sudo apt-get install libxml2-utils
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Set up JDK
uses: actions/[email protected]
with:
distribution: 'adopt'
java-version: '17'
cache: 'maven'
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Build
run: mvn -f code/oauth2-dev-server -B clean install
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Prepare
id: prep
run: |
PUSH=FALSE
pushd code
APP_EXISTS=$(make -s check-oads-image)
popd
if [[ $GITHUB_REF == refs/heads/* ]]; then
BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
if [ "${{ github.event.repository.default_branch }}" = "$BRANCH_NAME" ] && [ "$APP_EXISTS" != 'true' ]; then
PUSH=TRUE
fi
elif [[ $GITHUB_REF == refs/pull/* ]]; then
BRANCH_NAME=$(echo ${{ github.event.pull_request.head.ref }} | sed -r 's#/+#-#g')
if [[ $BRANCH_NAME == release-* ]]; then
PUSH=TRUE
SUFFIX=rc
else
SUFFIX=pr-${{ github.event.number }}
fi
fi
echo ::set-output name=push::${PUSH}
echo ::set-output name=suffix::${SUFFIX}
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Set up QEMU
uses: docker/setup-qemu-action@v1
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- if: ${{ steps.skip_check.outputs.should_skip != 'true' && steps.prep.outputs.push == 'true'}}
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Build and push
run: |
cd code
make build-oads SUFFIX=${{ steps.prep.outputs.suffix }} PUBLISH=${{ steps.prep.outputs.push }}
Loading

0 comments on commit 47c0deb

Please sign in to comment.