Skip to content

Commit df47fab

Browse files
authored
Merge pull request #548 from mtconnect/480_test_alpine_docker_build_on_github_actions
480 test alpine docker build on GitHub actions
2 parents 3fa2cef + acdb4a4 commit df47fab

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build-docker-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
name: Build Docker image
1717

1818
env:
19-
PLATFORMS: linux/amd64 # ,linux/arm64
19+
PLATFORMS: linux/amd64,linux/arm64
2020

2121
# when to run workflow
2222
on:
23-
# # run on push or pull request events for the master branch
23+
# # run on push or pull tags request events for the master branch
2424
push:
2525
tags:
2626
- "v*.*.*"
@@ -41,7 +41,7 @@ jobs:
4141
max-parallel: 1
4242
matrix:
4343
include:
44-
- dockerfile: docker/ubuntu/Dockerfile
44+
- dockerfile: docker/alpine/Dockerfile
4545
name: agent
4646
# - dockerfile: demo/Dockerfile
4747
# name: demo

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(AGENT_VERSION_MAJOR 2)
33
set(AGENT_VERSION_MINOR 5)
44
set(AGENT_VERSION_PATCH 0)
5-
set(AGENT_VERSION_BUILD 6)
5+
set(AGENT_VERSION_BUILD 7)
66
set(AGENT_VERSION_RC "")
77

88
# This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent

0 commit comments

Comments
 (0)