Skip to content

Commit 4a221f2

Browse files
committed
Workflows back to normal
1 parent 9effcce commit 4a221f2

File tree

2 files changed

+40
-44
lines changed

2 files changed

+40
-44
lines changed

.github/workflows/push.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
push:
77
branches:
88
- main
9-
- debug-release2
109

1110
jobs:
1211
javabuild:

.github/workflows/release.yml

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ env:
1313
on:
1414
release:
1515
types: [ published ]
16-
push:
17-
branches:
18-
- debug-release2
1916

2017
jobs:
2118
javabuild:
@@ -34,43 +31,43 @@ jobs:
3431
with:
3532
name: jarfile
3633
path: java/verticox/target
37-
# - name: Run Dunamai to get version
38-
# uses: mtkennerly/dunamai-action@v1.1.0
39-
# with:
40-
# # Version of Dunamai to install (e.g., "1.3.0").
41-
# # Name of environment variable in which to set the dynamic version.
42-
# #If this is empty, no environment variable will be set.
43-
# env-var: "VERTICOX_VERSION"# optional, default is
44-
# # Command to run Dunamai.
45-
# #command: # optional, default is dunamai from any
46-
# # Additional arguments to pass to the command.
47-
# args: --style semver --no-metadata
48-
#
49-
# # setup Docker build action
50-
# - name: Set up Docker Buildx
51-
# id: buildx
52-
# uses: docker/setup-buildx-action@v2
53-
#
54-
# - name: Login to Harbor
55-
# uses: docker/login-action@v1
56-
# with:
57-
# registry: ${{ env.HARBOR_HOST }}
58-
# username: ${{ secrets.HARBOR_USER }}
59-
# password: ${{ secrets.HARBOR_PASSWORD }}
60-
#
61-
# - name: Build image and push to Docker Hub and GitHub Container Registry
62-
# uses: docker/build-push-action@v4
63-
# with:
64-
# # relative path to the place where source code with Dockerfile is located
65-
# context: .
66-
# # Note: tags has to be all lower-case
67-
# tags: |
68-
# ${{ env.HARBOR_HOST }}/algorithms/verticox:${{env.VERTICOX_VERSION}}
69-
# ${{ env.HARBOR_HOST }}/algorithms/verticox
70-
#
71-
#
72-
# # build on feature branches, push only on main branch
73-
# push: true
74-
#
75-
# - name: Image digest
76-
# run: echo ${{ steps.docker_build.outputs.digest }}
34+
- name: Run Dunamai to get version
35+
uses: mtkennerly/dunamai-action@v1.1.0
36+
with:
37+
# Version of Dunamai to install (e.g., "1.3.0").
38+
# Name of environment variable in which to set the dynamic version.
39+
#If this is empty, no environment variable will be set.
40+
env-var: "VERTICOX_VERSION"# optional, default is
41+
# Command to run Dunamai.
42+
#command: # optional, default is dunamai from any
43+
# Additional arguments to pass to the command.
44+
args: --style semver --no-metadata
45+
46+
# setup Docker build action
47+
- name: Set up Docker Buildx
48+
id: buildx
49+
uses: docker/setup-buildx-action@v2
50+
51+
- name: Login to Harbor
52+
uses: docker/login-action@v1
53+
with:
54+
registry: ${{ env.HARBOR_HOST }}
55+
username: ${{ secrets.HARBOR_USER }}
56+
password: ${{ secrets.HARBOR_PASSWORD }}
57+
58+
- name: Build image and push to Docker Hub and GitHub Container Registry
59+
uses: docker/build-push-action@v4
60+
with:
61+
# relative path to the place where source code with Dockerfile is located
62+
context: .
63+
# Note: tags has to be all lower-case
64+
tags: |
65+
${{ env.HARBOR_HOST }}/algorithms/verticox:${{env.VERTICOX_VERSION}}
66+
${{ env.HARBOR_HOST }}/algorithms/verticox
67+
68+
69+
# build on feature branches, push only on main branch
70+
push: true
71+
72+
- name: Image digest
73+
run: echo ${{ steps.docker_build.outputs.digest }}

0 commit comments

Comments
 (0)