Skip to content

Commit

Permalink
merge 4.x history
Browse files Browse the repository at this point in the history
  • Loading branch information
giohappy committed Sep 9, 2022
2 parents 0127858 + fd2d9a0 commit cc883a9
Show file tree
Hide file tree
Showing 1,204 changed files with 6,238 additions and 18 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/build.yml → .github/workflows/4.x-build.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# This is a basic workflow to help you get started with Actions

name: GeoNode Client CI (build)
name: GeoNode Client 4.x CI (build)

concurrency:
group: "client_build"
group: "client_build_4.x"
cancel-in-progress: true
# Controls when the workflow will run
on:
# Triggers the workflow on push events but only for the master branch
# Triggers the workflow on push events but only for the 4.x branch
push:
branches: [ master ]
branches: [ 4.x ]
paths:
- "geonode_mapstore_client/client/**"
- "!geonode_mapstore_client/client/version.txt"
Expand Down Expand Up @@ -80,6 +80,8 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
token: ${{ steps.generate-token.outputs.token }}
base: "master"
title: "new client build"
body: "Automated client build from GeoNode Client CI"
base: "4.x"
title: "[4.x] new client build"
body: "Automated client build from GeoNode Client 4.x CI"
branch: "4.x-create-pull-request/patch"

6 changes: 3 additions & 3 deletions .github/workflows/test.yml → .github/workflows/4.x-test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# This is a basic workflow to help you get started with Actions

name: GeoNode Client CI (tests)
name: GeoNode Client 4.x CI (tests)

# Controls when the workflow will run
on:
# Triggers the workflow pull request events but only for the master branch
# Triggers the workflow pull request events but only for the 4.x branch
pull_request:
branches: [ master ]
branches: [ 4.x ]
paths:
- "geonode_mapstore_client/client/**"

Expand Down
105 changes: 105 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.1
4.0.3
1,219 changes: 1,219 additions & 0 deletions diff.txt

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Loading

0 comments on commit cc883a9

Please sign in to comment.