Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/2.20.1 #204

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/test_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ on:
env:
REGISTRY: ghcr.io
BASE_IMG_REPO: project8/luna_base
BASE_IMG_TAG: v1.3.3-dev
BASE_IMG_TAG: v1.3.4-dev
FINAL_BASE_IMG_REPO: project8/luna_base
FINAL_BASE_IMG_TAG: v1.3.3
FINAL_BASE_IMG_TAG: v1.3.4
NARG: 2
DO_DOCKER_PUSH: ${{ github.event_name == 'push' && ( contains(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' ) }}
jobs:

docker-build-and-publish:
Expand Down Expand Up @@ -115,7 +114,7 @@ jobs:

- name: Build to Push
id: build-to-push
if: ${{ env.DO_DOCKER_PUSH }}
if: github.event_name == 'push' && ( contains(github.ref, 'refs/tags/') || github.ref == 'refs/heads/develop' )
uses: docker/build-push-action@v5
with:
context: .
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG final_img_repo=ghcr.io/project8/luna_base
ARG final_img_tag=v1.3.3
ARG final_img_tag=v1.3.4

ARG build_img_repo=ghcr.io/project8/luna_base
ARG build_img_tag=v1.3.3-dev
ARG build_img_tag=v1.3.4-dev

########################
FROM ${build_img_repo}:${build_img_tag} AS build
Expand Down
2 changes: 1 addition & 1 deletion Nymph
Submodule Nymph updated 2 files
+1 −1 CMakeLists.txt
+1 −1 Scarab