Compare commits

..

12 Commits

Author SHA1 Message Date
Akshay Jagadish
3c074906cb commit to trigger build 2021-03-11 12:39:39 -05:00
Akshay Jagadish
0950220752 WIFI-1669 Propagating bug fixes 2021-03-10 17:19:30 -05:00
Mike Hansen
aaf1abf5d1 WIFI-1734: AP not broadcasting Passpoint Access SSID unless OSU SSID is configured in Passpoint Profile 2021-03-10 10:55:33 -05:00
Mike Hansen
ee0588ab75 WIFI-835: Captive Portal: User List Authentication feature does not work unless user list is pushed to cloud manually. 2021-03-05 17:55:44 -05:00
Dmitry Toptygin
0757515090 Propagate WIFI-1440 fix to release branch (#85) 2021-03-03 17:37:47 -05:00
Max Brenner
c4c8f8544e remove parent module from child modules 2021-03-03 18:51:31 +01:00
Max Brenner
cccf4c663a update CI workflow to handle tags properly 2021-03-03 18:37:12 +01:00
Akshay Jagadish
79adbf163f Merge branch 'release/v1.0.0' of https://github.com/Telecominfraproject/wlan-cloud-workspace into release/v1.0.0 2021-03-01 11:41:53 -05:00
Akshay Jagadish
ae0a5082a5 Propagation of submodules to to workspace 2021-03-01 11:41:17 -05:00
Max Brenner
b48bd6ec23 trigger build on release branches 2021-03-01 14:29:14 +01:00
AkshayJagadish-ne
5d53759d86 Merge pull request #3 from Telecominfraproject/WIFI-1669
WIFI-1669: TIP 1.0 Update SDK components in release 1.0 branch
2021-02-27 22:06:16 -05:00
Akshay Jagadish
7628c8b1f8 WIFI-1669: TIP 1.0 Update SDK components in release 1.0 branch 2021-02-26 18:14:17 -05:00
11 changed files with 4274 additions and 2199 deletions

View File

@@ -2,7 +2,11 @@ name: Java Maven CI - TIP WLAN Cloud Master
on:
push:
branches: [ master ]
branches:
- master
- 'release/**'
tags:
- '*'
schedule:
# runs nightly build at 5AM
@@ -37,6 +41,26 @@ jobs:
password: ${{ secrets.MAVEN_REPO_PASSWORD }}
- name: Configure maven settings.xml
run: cp .github/workflows/maven_settings_template.xml /home/runner/.m2/settings.xml
- name: Update version in pom.xml
if: startsWith(github.ref, 'refs/tags/')
run: |
VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/tags\/[v]//')
mvn -B --file wlan-cloud-root/pom.xml versions:set -DnewVersion=$VERSION
mvn -B --file wlan-cloud-root/pom.xml install # put new parent version into Maven cache
mvn -B --file wlan-cloud-root/pom.xml versions:revert # need to revert so that child modules are able to find its parent
mvn -B --file all-modules-build/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-opensync-controller/opensync-gateway-static-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-opensync-controller/opensync-gateway-cloud-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/all-cloud-and-opensync-gw-in-one-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/all-cloud-in-one-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/portal-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/prov-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/ssc-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/spc-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/port-forwarding-gateway-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-services/schema-generator/pom.xml versions:update-parent -DparentVersion=[$VERSION]
mvn -B --file wlan-cloud-root/pom.xml versions:set -DnewVersion=$VERSION
- name: Updating commit file
run: |
TIMESTAMP=$(date +'%Y-%m-%d')

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>com.telecominfraproject.wlan</groupId>
<artifactId>tip-wlan-cloud-root-pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../wlan-cloud-root</relativePath>
</parent>
@@ -21,7 +21,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>../wlan-cloud-root</module>
<module>../wlan-cloud-base/base-build</module>
<module>../wlan-cloud-services/cloud-services-build</module>
<module>../wlan-cloud-opensync-controller/opensync-gateway-build</module>

View File

@@ -15,11 +15,10 @@ echo "Updating TIP pom.xml files from $PREVIOUS_VERSION to version $new_version
mvn --batch-mode release:update-versions -DdevelopmentVersion="$new_version" -DautoVersionSubmodules=true
# update version that are not automatically updated
# update version that are not automatically updated
sed -i '' "s/<tip-wlan-cloud.release.version>$PREVIOUS_VERSION<\/tip-wlan-cloud.release.version>/<tip-wlan-cloud.release.version>$new_version<\/tip-wlan-cloud.release.version>/g" ../wlan-cloud-root/pom.xml
#update protobuff dependency under opensync-ext-interface
sed -i '' "s/<version>$PREVIOUS_VERSION<\/version>/<version>$new_version<\/version>/g" ../wlan-cloud-opensync-controller/opensync-ext-interface/pom.xml
echo "Updated TIP pom.xml files to version $new_version"

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>com.telecominfraproject.wlan</groupId>
<artifactId>tip-wlan-cloud-root-pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../wlan-cloud-root</relativePath>
</parent>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long