Skip to content

Commit 77100ed

Browse files
committed
Merge branch 'release/0.1.1'
2 parents 28dccff + 81e8e1d commit 77100ed

File tree

6 files changed

+19
-10
lines changed

6 files changed

+19
-10
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
uses: ZEISS-PiWeb/github-actions/.github/workflows/build-and-pack.yml@feature/Action_Configuration
11+
uses: georg-eckert-zeiss/ghp/.github/workflows/build-and-pack.yml@main
1212
with:
1313
configuration: "Release"
1414
do_pack: false
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
# Create a stable project release. This workflow is manually triggered.
2-
31
name: Create release (from develop only!)
42

5-
# Run on manual trigger only
63
on:
74
workflow_dispatch:
85

96
jobs:
107
release:
11-
uses: ZEISS-PiWeb/github-actions/.github/workflows/create-release.yml@feature/Action_Configuration
8+
uses: georg-eckert-zeiss/ghp/.github/workflows/create-release.yml@main
9+
secrets: inherit

.github/workflows/develop.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Workflow to build and publish the develop branch
2-
31
name: Build on develop
42

53
on:
@@ -10,7 +8,7 @@ on:
108

119
jobs:
1210
develop:
13-
uses: ZEISS-PiWeb/github-actions/.github/workflows/develop.yml@feature/Action_Configuration
11+
uses: georg-eckert-zeiss/ghp/.github/workflows/develop.yml@main
1412
with:
1513
do_pack: false
1614
secrets: inherit
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: .NET Core Desktop
2+
3+
on:
4+
push:
5+
branches: [ "develop" ]
6+
pull_request:
7+
branches: [ "develop" ]
8+
9+
jobs:
10+
build:
11+
uses: georg-eckert-zeiss/ghp/.github/workflows/test.yml@main
12+
with:
13+
configuration: "Release"

.github/workflows/feature-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
publish-feature-branch:
11-
uses: ZEISS-PiWeb/github-actions/.github/workflows/feature-branch.yml@feature/Action_Configuration
11+
uses: georg-eckert-zeiss/ghp/.github/workflows/feature-branch.yml@main
1212
with:
1313
do_pack: false
1414
secrets: inherit

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Playground for experimenting with reusable GitHub actions.
55
The following actions exist:
66

77
+ build-and-test: builds and tests the repo, automatically triggered on pushes to main
8-
+
8+
+ simple test commit

0 commit comments

Comments
 (0)