Skip to content

Commit

Permalink
Internal release
Browse files Browse the repository at this point in the history
  • Loading branch information
brondani committed May 6, 2024
1 parent 3d07ab5 commit 509453d
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/projmgr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
if: |
github.event_name == 'release' &&
startsWith(github.ref, 'refs/tags/tools/projmgr/')
needs: [ build, build-swig, unittest, coverage ]
needs: [ build, build-swig, unittest ]
runs-on: ubuntu-22.04
timeout-minutes: 15

Expand Down
12 changes: 6 additions & 6 deletions tools/buildmgr/cbuildgen/installer/make_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${c
curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${input}/bin/cpackget.lin-amd64

# Get cbuild2cmake
cbuild2cmake_version="0.9.0"
cbuild2cmake_base=https://github.com/Open-CMSIS-Pack/cbuild2cmake/releases/download/v${cbuild2cmake_version}/cbuild2cmake_${cbuild2cmake_version}
cbuild2cmake_version="0.9.1-devint0"
cbuild2cmake_base=https://github.com/brondani/cbuild2cmake/releases/download/v${cbuild2cmake_version}/cbuild2cmake_${cbuild2cmake_version}
curl --retry 3 -L ${cbuild2cmake_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cbuild2cmake' > ${distdir}/bin/cbuild2cmake.lin-amd64

# Get generator-bridge
Expand All @@ -110,16 +110,16 @@ cbridge_base=https://github.com/Open-CMSIS-Pack/generator-bridge/releases/downlo
curl --retry 3 -L ${cbridge_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${input}/bin/cbridge.lin-amd64

# Get csolution
csolution_version="2.3.0"
csolution_base=https://github.com/Open-CMSIS-Pack/devtools/releases/download/tools%2Fprojmgr%2F${csolution_version}/projmgr.zip
csolution_version="2.4.0-devint1"
csolution_base=https://github.com/brondani/devtools/releases/download/tools%2Fprojmgr%2F${csolution_version}/projmgr.zip
curl --retry 3 -L ${csolution_base} -o temp.zip && unzip -q -d temp temp.zip
cp 'temp/bin/linux-amd64/csolution' ${input}/bin/csolution.lin-amd64
cp -r temp/etc/* etc/${PACKAGE_NAME}
cp -r temp/etc/* usr/lib/${PACKAGE_NAME} && rm temp.zip && rm -rf temp

# Get cbuild
cbuild_version="2.3.0"
cbuild_base=https://github.com/Open-CMSIS-Pack/cbuild/releases/download/v${cbuild_version}/cbuild_${cbuild_version}
cbuild_version="2.4.0-devint0"
cbuild_base=https://github.com/brondani/cbuild/releases/download/v${cbuild_version}/cbuild_${cbuild_version}
curl --retry 3 -L ${cbuild_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cbuild' > ${input}/bin/cbuild.lin-amd64

cp -r ${input}/bin usr/lib/${PACKAGE_NAME} # This should be in /usr/bin but cannot for the time being.
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cbuild-gen-idx.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cbuild-gen-idx.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cbuild-gen-idx.schema.json",
"title": "CMSIS cbuild-gen-idx",
"description": "defines sibling contexts description for a generator call",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"build-gen-idx": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cbuild-gen.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cbuild-gen.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cbuild-gen.schema.json",
"title": "CMSIS cbuild-gen",
"description": "defines an individual context description for a generator call",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"build-gen": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cbuild-idx.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cbuild-idx.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cbuild-idx.schema.json",
"title": "CMSIS cbuild-idx",
"description": "defines a build description for a solution",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"build-idx": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cbuild-pack.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cbuild-pack.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cbuild-pack.schema.json",
"title": "CMSIS cbuild-pack",
"description": "file containing all pack versions used, used for pack locking",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"cbuild-pack": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cbuild-set.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cbuild-set.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cbuild-set.schema.json",
"title": "CMSIS cbuild-set",
"description": "defines a selected set of build configuration",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"cbuild-set": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cbuild.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cbuild.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cbuild.schema.json",
"title": "CMSIS cbuild",
"description": "defines a build description for a project",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"build": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cdefault.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cdefault.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cdefault.schema.json",
"title": "CMSIS cdefault",
"description": "setup of a build environment with toolchain specific controls; defines a default compiler",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"default": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cgen.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cgen.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cgen.schema.json",
"title": "CMSIS cgen",
"description": "set of source files and pre-configured components generated by external program",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"generator-import": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/clayer.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/clayer.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/clayer.schema.json",
"title": "CMSIS clayer",
"description": "set of source files and pre-configured components for reuse in different applications",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"layer": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/common.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/common.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/common.schema.json",
"title": "CMSIS common",
"description": "common and reusable properties from other schemas",
"version": "2.3.0",
"version": "2.4.0-devint1",
"definitions": {
"ArrayOfStrings": {
"type": "array",
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/cproject.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/cproject.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/cproject.schema.json",
"title": "CMSIS cproject",
"description": "source files and pre-configured components of a sub-project that builds independently",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"project": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/csolution.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/csolution.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/csolution.schema.json",
"title": "CMSIS csolution",
"description": "complete scope of an application composed of sub-projects; defines a target and build types",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"solution": {
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/generator.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.3.0/tools/projmgr/schemas/generator.schema.json",
"$id": "https://raw.githubusercontent.com/brondani/devtools/schemas/projmgr/2.4.0-devint1/tools/projmgr/schemas/generator.schema.json",
"title": "CMSIS generator registry",
"description": "defines global generator registry",
"version": "2.3.0",
"version": "2.4.0-devint1",
"type": "object",
"properties": {
"generator": {
Expand Down

0 comments on commit 509453d

Please sign in to comment.