Skip to content

Commit 2a92dd1

Browse files
Merge pull request #7 from Geode-solutions/next
Next
2 parents 5134dfd + 57dca47 commit 2a92dd1

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

.github/workflows/Branch-protection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ jobs:
77
check-branch-protection:
88
uses: Geode-solutions/actions/.github/workflows/branch-protection.yml@master
99
with:
10-
branch_from: 'develop'
10+
branch_from: 'next'
1111
branch_to: 'master'

.github/workflows/CD.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Docker Image CD
22

33
on:
44
push:
5-
branches: [ master, develop ]
5+
branches: [ master, next ]
66

77
jobs:
88
docker-build-squash-push:
99
uses: Geode-solutions/actions/.github/workflows/docker-build-squash-push.yml@master
1010
with:
11-
image_name: 'opengeodeweb_router'
11+
image_name: 'opengeodeweb-router'
1212
tag: ${{ github.ref_name }}
1313
secrets:
1414
TOKEN: ${{secrets.GITHUB_TOKEN}}

COPYLEFT

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## Dependencies
2+
3+
Nginx: BSD-2-Clause
4+
Copyright (C) 2011-2023 Nginx, Inc.

0 commit comments

Comments
 (0)