Skip to content

Commit 982d07f

Browse files
Merge pull request #4 from Geode-solutions/develop
Develop
2 parents d271303 + 546150a commit 982d07f

2 files changed

Lines changed: 20 additions & 22 deletions

File tree

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Check branch origin
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check-branch-protection:
8+
uses: Geode-solutions/actions/.github/workflows/branch-protection.yml@master
9+
with:
10+
branch_from: 'develop'
11+
branch_to: 'master'

.github/workflows/CD.yml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,13 @@ name: Docker Image CD
33
on:
44
push:
55
branches: [ master, develop ]
6+
67
jobs:
7-
build:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- uses: actions/checkout@v3
11-
- name: GithubPackages Login
12-
uses: docker/login-action@v1.10.0
13-
with:
14-
registry: ghcr.io
15-
username: ${{ github.actor }}
16-
password: ${{ secrets.GITHUB_TOKEN }}
17-
- name: Extract metadata (tags, labels) for Docker
18-
id: meta
19-
uses: docker/metadata-action@v3
20-
with:
21-
images: ghcr.io/${{ github.repository }}
22-
- name: Build and push Docker images
23-
uses: docker/build-push-action@v2
24-
with:
25-
context: .
26-
push: true
27-
tags: ${{ steps.meta.outputs.tags }}
28-
labels: ${{ steps.meta.outputs.labels }}
8+
docker-build-squash-push:
9+
uses: Geode-solutions/actions/.github/workflows/docker-build-squash-push.yml@master
10+
with:
11+
image_name: 'sharetwin_router'
12+
tag: ${{ github.ref_name }}
13+
secrets:
14+
TOKEN: ${{secrets.GITHUB_TOKEN}}
15+

0 commit comments

Comments
 (0)