Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/eclipse/dirigible
Browse files Browse the repository at this point in the history
  • Loading branch information
delchev committed Mar 12, 2021
2 parents a6d92d9 + ea70ebc commit 17efea4
Show file tree
Hide file tree
Showing 89 changed files with 1,783 additions and 98 deletions.
80 changes: 80 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,16 @@ jobs:
</dependency>
```
#### Helm:
All Helm Charts can be found [here](https://artifacthub.io/packages/search?page=1&repo=eclipse-dirigible).
```
helm repo add dirigible https://eclipse.github.io/dirigible
helm repo update
helm install dirigible dirigible/dirigible --ingress.enabled=false --version ${{ env.DIRIGIBLE_VERSION }}
```
#### Docker images:
- [dirigiblelabs/dirigible-anonymous](https://hub.docker.com/r/dirigiblelabs/dirigible-anonymous/tags?page=1&ordering=last_updated) - Anonymous access.
- [dirigiblelabs/dirigible-runtime-anonymous](https://hub.docker.com/r/dirigiblelabs/dirigible-runtime-anonymous/tags?page=1&ordering=last_updated) - Anonymous access _(runtime only)_.
Expand Down Expand Up @@ -351,6 +361,76 @@ jobs:

#----------------Publish GitHub Release------------------#

#----------------Publish Helm Release------------------#

- name: Helm tool installer
uses: Azure/setup-helm@v1
- name: Helm Charts Release - Checkout gh-pages
run: |
mkdir charts-temp
cp -r releng/helm-charts/ charts-temp/
#### Git Checkout Workaround
git add .github/
git add .reuse/
git add LICENSES/
git add api/
git add ext/
git add groups/
git add ide/
git add logo/
git add modules/
git add releng/
git add resources/
git add templates/
git reset --hard
####
git fetch
git checkout gh-pages
cp charts/* .
- name: Helm Charts Release - Set Chart Version - Dirigible
run: |
cd charts-temp/helm-charts/dirigible/
find *.yaml -type f -exec sed -i ''s/#{DirigibleVersion}#/${{ env.DIRIGIBLE_VERSION }}/g'' {} \;
- name: Helm Charts Release - Set Chart Version - Dirigible - Kyma
run: |
cd charts-temp/helm-charts/dirigible-kyma/
find *.yaml -type f -exec sed -i ''s/#{DirigibleVersion}#/${{ env.DIRIGIBLE_VERSION }}/g'' {} \;
- name: Helm Charts Release
run: |
cp charts/* charts-temp/helm-charts/
cd charts-temp/helm-charts/
helm package dirigible
helm package dirigible-kyma
mv dirigible-$DIRIGIBLE_VERSION.tgz chart-dirigible-$DIRIGIBLE_VERSION.tgz
mv dirigible-kyma-$DIRIGIBLE_VERSION.tgz chart-dirigible-kyma-$DIRIGIBLE_VERSION.tgz
cd ..
helm repo index helm-charts/ --url https://eclipse.github.io/dirigible/charts
cp helm-charts/index.yaml ../.
cp helm-charts/chart-dirigible-$DIRIGIBLE_VERSION.tgz ../charts/
cp helm-charts/chart-dirigible-kyma-$DIRIGIBLE_VERSION.tgz ../charts/
cd ..
git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"
git add index.yaml
git add charts/
git commit -m "Updates Helm Charts - Release $DIRIGIBLE_VERSION"
git push origin gh-pages
git add .
git reset --hard
git checkout master
#----------------Publish Helm Release------------------#

#-----------------Create GitHub Branch-------------------#

- name: Create GitHub Branch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public static final String query(String sql, String parameters, String databaseT
setParameters(parameters, preparedStatement);
}
ResultSet resultSet = preparedStatement.executeQuery();
return DatabaseResultSetHelper.toJson(resultSet, true);
return DatabaseResultSetHelper.toJson(resultSet, false);
} finally {
if (preparedStatement != null) {
preparedStatement.close();
Expand Down
Loading

0 comments on commit 17efea4

Please sign in to comment.