Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#162
Browse files Browse the repository at this point in the history
# Conflicts:
#	DisplayObjects/mobile/assets/i18n/en.json
#	DisplayObjects/mobile/assets/i18n/es.json
#	DisplayObjects/mobile/assets/i18n/fr.json
#	DisplayObjects/mobile/assets/i18n/it.json
#	Flashupdate/md5.json
#	_c8oProject/connectors/c8oforms_fs.yaml
#	_c8oProject/mobileApplication.yaml
#	_c8oProject/mobileSharedComponents/sharedHeaderImageConvertigo.yaml
#	_c8oProject/sequences/AddUser.yaml
#	_c8oProject/sequences/Login.yaml
#	_c8oProject/sequences/LoginAD.yaml
#	_c8oProject/sequences/LoginGoogle.yaml
#	_c8oProject/sequences/LoginMicrosoft.yaml
#	_c8oProject/sequences/MigrationApiV2.yaml
#	c8oProject.yaml
  • Loading branch information
CharlesGrimont committed Jun 5, 2021
2 parents 8391816 + 1b2fafb commit 3e1a974
Show file tree
Hide file tree
Showing 307 changed files with 60,300 additions and 29,602 deletions.
53 changes: 0 additions & 53 deletions .circleci/config.yml

This file was deleted.

79 changes: 79 additions & 0 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# This is a basic workflow to help you get started with Actions

name: Build deploy and pre-release

# Controls when the action will run.
on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+-beta[0-9]+'
# Triggers the workflow on push or pull request events but only for the develop branch
#push:
# tags:
# - '**-beta**'
# - '*.*.*'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
with:
fetch-depth: 0
# SetUp java 11
- name: Setup Java
uses: actions/setup-java@v1.4.3
with:
java-version: '11'
# Builds and deploy Convertigo Forms versions
- name: Build and deploy Convertigo Forms betas versions
env:
TESTENDPOINT: ${{secrets.testEndpoint}}
DEPLOYSERVER: ${{secrets.testEndpoint}}
TESTUSERADMIN: ${{secrets.testUserAdmin}}
TESTUSERPASSWORD: ${{secrets.testUserPassword}}
run: sh gradlew --no-daemon --stacktrace --info car deploy -Pconvertigo.load.mobileApplicationEndpoint="$TESTENDPOINT" -Pconvertigo.deploy.server="$DEPLOYSERVER" -Pconvertigo.deploy.user="$TESTUSERADMIN" -Pconvertigo.deploy.password="$TESTUSERPASSWORD"
# Creates "c8oforms_standalone" dockerized version
- name: Create "c8oforms_standalone" dockerized version
run: |
cp /home/runner/work/C8oForms/C8oForms/build/C8Oforms.car /home/runner/work/C8oForms/C8oForms/c8oforms_standalone/workspace/projects/C8Oforms.car
cd /home/runner/work/C8oForms/C8oForms/ && tar -czvf c8oforms_standalone.tar.gz c8oforms_standalone
# Creates a release
- name: Create a release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
draft: false
prerelease: true
- name: Upload asset C8oForms.car
id: upload-release-asset_C8oForms
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: /home/runner/work/C8oForms/C8oForms/build/C8Oforms.car
asset_name: C8Oforms.car
asset_content_type: application/zip
- name: Upload asset c8oforms_standalone.tar.gz
id: upload-release-asset_c8oforms_standalone
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: /home/runner/work/C8oForms/C8oForms/c8oforms_standalone.tar.gz
asset_name: c8oforms_standalone.tar.gz
asset_content_type: application/tar+gzip
88 changes: 88 additions & 0 deletions .github/workflows/build_and_deploy_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# This is a basic workflow to help you get started with Actions

name: Build deploy and release

# Controls when the action will run.
on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'
# Triggers the workflow on push or pull request events but only for the develop branch
#push:
# tags:
# - '**-beta**'
# - '*.*.*'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
with:
fetch-depth: 0
# SetUp java 11
- name: Setup Java
uses: actions/setup-java@v1.4.3
with:
java-version: '11'
# Builds and deploy Convertigo Forms versions
- name: Build and deploy Convertigo Forms betas versions
env:
TESTENDPOINT: ${{secrets.testEndpoint}}
DEPLOYSERVER: ${{secrets.testEndpoint}}
TESTUSERADMIN: ${{secrets.testUserAdmin}}
TESTUSERPASSWORD: ${{secrets.testUserPassword}}
run: sh gradlew --no-daemon --stacktrace --info car deploy -Pconvertigo.load.mobileApplicationEndpoint="$TESTENDPOINT" -Pconvertigo.deploy.server="$DEPLOYSERVER" -Pconvertigo.deploy.user="$TESTUSERADMIN" -Pconvertigo.deploy.password="$TESTUSERPASSWORD"
# Creates "c8oforms_standalone" dockerized version
- name: Create "c8oforms_standalone" dockerized version
run: |
cp /home/runner/work/C8oForms/C8oForms/build/C8Oforms.car /home/runner/work/C8oForms/C8oForms/c8oforms_standalone/workspace/projects/C8Oforms.car
cd /home/runner/work/C8oForms/C8oForms/ && tar -czvf c8oforms_standalone.tar.gz c8oforms_standalone
# Creates a changelog
- name: Generate changelog
id: generate_changelog_C8oForms
uses: heinrichreimer/action-github-changelog-generator@v2.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
sinceTag: 1.0.44
# Creates a release
- name: Create a release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body: |
${{ steps.generate_changelog_C8oForms.outputs.changelog }}
draft: false
prerelease: false
- name: Upload asset C8oForms.car
id: upload-release-asset_C8oForms
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: /home/runner/work/C8oForms/C8oForms/build/C8Oforms.car
asset_name: C8Oforms.car
asset_content_type: application/zip
- name: Upload asset c8oforms_standalone.tar.gz
id: upload-release-asset_c8oforms_standalone
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: /home/runner/work/C8oForms/C8oForms/c8oforms_standalone.tar.gz
asset_name: c8oforms_standalone.tar.gz
asset_content_type: application/tar+gzip
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
/DisplayObjects/mobile/*
!/DisplayObjects/mobile/assets

# disable this for custom Flashupdate

# disable this for custom config.xml
/csv/*

#c8oforms_standalone
Expand All @@ -15,4 +12,5 @@ c8oforms_standalone/workspace/*
!c8oforms_standalone/couchdb/.gitkeep
!c8oforms_standalone/workspace/projects/.gitkeep
.gradle/
/DisplayObjects/pwas/*
/DisplayObjects/pwas/*
/csv/**
24 changes: 1 addition & 23 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,12 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.genuitec.eclipse.typescript.typeScriptBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
<id>1482759084458</id>
<id>1622918813667</id>
<name></name>
<type>26</type>
<matcher>
Expand Down
Loading

0 comments on commit 3e1a974

Please sign in to comment.