Skip to content

Commit

Permalink
Pull request #7: Develop -> Master
Browse files Browse the repository at this point in the history
Merge in MCU16CE/dspic33ch-power-tppfc-dev-platform from develop to master

* commit 'cef1e5adf5d810175d1cabe7e1420306e2a31aab': (22 commits)
  Deployment file fixes: * project name did not match repository name * copyright year of readme file was outdated
  Added release notes to changelog.md changed version to 1.0.0. Also made this change in the revision.h files for the primary and secondary projects
  Deplyoment file fixes: * Disabled Github Pages deployment trigger * Incremented copyright year of license file * Fixed version number semantic in changelog
  removed primary and secondary core json files, updated common json file
  removed commas from json files for primary and secondary core projects
  removed "peripherals" section from primary and secondary core json projects
  removed peripherals section in main.json
  changing default compile to 2.10, and DFP to 1.12.352 for both projects
  temporarily removed build stage in jenkinsfile for first deployment, will add back once tool chain issue is resolved
  Removed all file clutter from X-IDE directories and updated gitignore file
  Modified project configurations upgrading DFP and XC16 compiler version to January 2023 tool chain * MPLAB X IDE v6.05 * XC16 v 2.00 * dsPIC33CH-MP_DFP v1.13.354
  Resolved include path conficts with DCDT generated files when secondary project is built from primary project * Added common include path of DCDT sub-directory to XC16 configuration * Removed relative path navigation from include paths
  removed PFC configurator exe. modified gitignore to ignore exe files
  updated jenkinsfile
  removed unsupported keywords in json files removed unnecessary edits in jenkinsfile
  changed year from 2020 to 2022 in licence file
  updated main.json files for both MPLABx projects
  adding main.json files for both primary and secondary core projects
  adding PFC configurator GUI, also adding gitattributes so this file is tracked with Git LFS
  initial commit
  ...
  • Loading branch information
Cormac Harrington authored and areiter128 committed May 26, 2023
2 parents b0bfc93 + cef1e5a commit bafac80
Show file tree
Hide file tree
Showing 158 changed files with 38,707 additions and 25 deletions.
257 changes: 257 additions & 0 deletions .citd/Jenkinsfilek8s
Original file line number Diff line number Diff line change
@@ -0,0 +1,257 @@
/*
Jenkins Shared Library:
----------------------
shared-library-mcu16ce - https://bitbucket.microchip.com/scm/citd/shared-library-mcu16ce.git
shared-library-common - https://bitbucket.microchip.com/scm/citd/shared-library-common.git
*/
@Library(['shared-library-mcu16ce@master', 'shared-library-common@master']) _

pipeline {
agent {
kubernetes {
inheritFrom 'dspic33ch-power-tppfc-dev-platform-github-deployment'
defaultContainer 'xc16-mplabx-sonar-fmpp-python'
yamlFile '.citd/cloudprovider.yml'
}
}

environment {
/*
Common Information
*/
NOTIFICATION_EMAIL = '1f1319de.microchip.com@amer.teams.ms'
// GitHub production organization name
GITHUB_PRODUCTION_ORGANIZATION = "microchip-pic-avr-examples"

/*
GitHub Deploy Stage Information
*/
//This is the BitBucket source repo URL to be deployed
BITBUCKET_SOURCE_URL = 'https://bitbucket.microchip.com/scm/mcu16ce/dspic33ch-power-tppfc-dev-platform.git'
//Files or folders to be excluded from deployment, if multiple files or folders use comma separator
DEPLOY_EXCLUDE_FOLDER_FILE_LIST = 'mchp_private,.mchp_private,sandbox,.sandbox'
//Branch(s) to be deployed, if multiple branches use comma separator. DEPLOY_BRANCH_LIST is the target branch of the PR.
DEPLOY_BRANCH_LIST = "master"
/*When using the main.json schema version 1.3.0 or higher, the PORTAL will first reject registration attempt when an unapproved keyword is found, but can be forced to accept.
This argument is used to provide the list of unapproved keywords (also listed in main.json) which the deployment script will force the PORTAL to accept.*/
UNAPPROVED_KEYWORDS_OVERRIDE_LIST="NONE"

/*
GitHub Page Stage Information
List of GitHub Page Options:
----------------------------
1. GITHUB_PAGES_NONE ( Branch: None, index file path: None )
2. GITHUB_PAGES_MASTER_ROOT ( Branch: Master, index file path: /root )
3. GITHUB_PAGES_MASTER_DOCS ( Branch: Master, index file path: /Docs )
4. GITHUB_PAGES_DEVELOP_ROOT ( Branch: Develop, index file path: /root )
5. GITHUB_PAGES_DEVELOP_DOCS ( Branch: Develop, index file path: /Docs )
*/
GITHUB_PAGES = 'GITHUB_PAGES_NONE'

/*
Project Build Stage Information
*/
MPLABX_PROJECT_SOURCE = "../"
}

triggers {
cron(env.BRANCH_NAME == 'develop' ? 'H H 1 * *': '')
}
options {
timestamps()
timeout(time: 30, unit: 'MINUTES')
}

stages {
stage('Checkout') {
steps {
checkout scm
}
}

stage('project config update') {
steps {
script {
mplabxProjectConfigUpdate(
sourceFilePath: "${env.MPLABX_PROJECT_SOURCE}"
)
}
}
}

// stage('Build') {
// steps {
// script {
// mplabxProjectBuild(
// sourceFilePath: "${env.MPLABX_PROJECT_SOURCE}"
// )
// }
// }
// }


//MisraCheck code analysis
stage('MISRA Check') {
steps {
script {
misraCheck(
sourceProjectPath: "${env.MPLABX_PROJECT_SOURCE}"
)
}
}
}

// Validate main.json file
stage('Validate main.json') {
steps {
script {
validateMetaData(
unapprovedKeywordsOverrideList: "${UNAPPROVED_KEYWORDS_OVERRIDE_LIST}"
)
}
}
}

stage('Doxygen files generation') {
when {
anyOf {
allOf {
not { changeRequest() }
}
}
}
steps {
container('buildtools') {
script {
doxygen()
}
}
}
}

// GitHub repo creation
stage('GitHub Repo Creation') {
when {
anyOf {
allOf {
not { changeRequest() }
anyOf {branch 'master'; branch 'test_deploy';}
}
}
}

steps {
script {
githubRepoCreate(
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}",
deployBranchList: "${DEPLOY_BRANCH_LIST}"
)
}
}
}

// Deploying the code to GitHub
stage('GitHub Deploy Source') {
when {
anyOf {
allOf {
not { changeRequest() }
anyOf {branch 'master'; branch 'test_deploy';}
}
}
}

steps {
script {
githubDeploySource(
bitbucketUrl: "${env.BITBUCKET_SOURCE_URL}",
deployBranchList: "${env.DEPLOY_BRANCH_LIST}",
deployExcludeFileList: "${env.DEPLOY_EXCLUDE_FOLDER_FILE_LIST}",
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}"
)
}
}
}

// Creating GitHub release
stage('GitHub release') {
when {
anyOf {
allOf {
not { changeRequest() }
anyOf {branch 'master'; branch 'test_deploy';}
}
}
}

steps {
script {
githubReleaseCreate(
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}",
deployBranchList: "${DEPLOY_BRANCH_LIST}"
)
}
}
}

// Creating GitHub Page
stage('GitHub Page Create') {
when {
anyOf {
allOf {
not { changeRequest() }
anyOf {branch 'master';}
}
}
}

steps {
script {
githubPageCreate(
githubPage: "${env.GITHUB_PAGES}",
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}"
)
}
}
}

//Deploying the Github content to portal
stage('Portal-Deploy') {
when {
allOf {
not { changeRequest() }
anyOf {branch 'master';}
}
}
steps {
script {
portalDeploy(
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}",
unapprovedKeywordsOverrideList: "${UNAPPROVED_KEYWORDS_OVERRIDE_LIST}"
)
}
}
}
}

post {
success{
script {
sendMail(
mailId: "${env.NOTIFICATION_EMAIL}",
subject: "Successful Pipeline: ${currentBuild.fullDisplayName}",
body: "Something is right with ${env.BUILD_URL}"
)
}
}
failure {
script {
sendMail(
mailId: "${env.NOTIFICATION_EMAIL}",
subject: "Failure Pipeline: ${currentBuild.fullDisplayName}",
body: "Something is right with ${env.BUILD_URL}"
)
}
}
}
}
30 changes: 30 additions & 0 deletions .citd/cloudprovider.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
apiVersion: v1
kind: Pod
metadata:
name: xc16-mplabx-sonar-fmpp-python
spec:
containers:
- name: xc16-mplabx-sonar-fmpp-python
image: artifacts.microchip.com:7999/microchip/citd/bundles/xc16-mplabx-sonar-fmpp-python-yarn-node:latest
imagePullPolicy: Always
command: ['cat']
tty: true
resources:
requests:
cpu: 500m
memory: 1500Mi
limits:
cpu: 1
memory: 2Gi
- name: buildtools
image: artifacts.microchip.com:7999/microchip/buildtools/doxygen:1.8.15-r0
imagePullPolicy: Always
command: ['cat']
tty: true
resources:
requests:
cpu: 500m
memory: 750Mi
limits:
cpu: 1
memory: 1Gi
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.exe filter=lfs diff=lfs merge=lfs -text
65 changes: 65 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# .gitignore file
#
# Set up for Microchip/MPLAB X® development projects
#
# Default gitignore files for code examples, only removing/ignoring usual MPLAB X® clutter

# Excluding object files
*.o
*.ko
*.obj
*.elf

# Excluding documentation output directories
# Use '#' to enable file tracking before release
docs/

# Excluding any executables
*.exe

#Excluding Files/Folders Auto-Generated by Test Harness
.generated_files/

# Excluding Netbeans specific build directories and file types
~*.*
.generated_files/
nbproject/build/
nbproject/dist/
nbproject/private/
nbproject/disassembly/
build/
dist/
private/
disassembly/
*.zip
!code-templates.zip
*.mk
*.bash
*.dump
Makefile-genesis.properties

# Excluding MPLAB X® Trace files
*.log
*.inx

# KDE specific
.directory

# Misc
# Use '#' to enable file tracking of certain types
.svn
*.lnk
*.bak

# don't include files in the temp-directory
temp/

*.doc
*.docx
*.ppt
*.pptx
*.xls
*.xlsx
*.xlsm

# end of file
Loading

0 comments on commit bafac80

Please sign in to comment.