Skip to content

Commit de36ed0

Browse files
committed
fixing env vars in ci
1 parent 7211344 commit de36ed0

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ on: # yamllint disable-line rule:truthy rule:comments
1313
pull_request: ~
1414

1515
env:
16-
IMAGE_NAME: "pyntc"
16+
INVOKE_PYNTC_INVOKE_PYNTC_IMAGE_NAME: "pyntc"
17+
INVOKE_PYNTC_INVOKE_PYNTC_IMAGE_VER: "latest"
1718

1819
jobs:
1920
ruff-format:
@@ -96,7 +97,7 @@ jobs:
9697
- name: "Setup environment"
9798
uses: "networktocode/gh-action-setup-poetry-environment@v6"
9899
- name: "Get image version"
99-
run: "echo IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
100+
run: "echo INVOKE_PYNTC_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
100101
- name: "Set up Docker Buildx"
101102
id: "buildx"
102103
uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
@@ -107,10 +108,10 @@ jobs:
107108
context: "./"
108109
push: false
109110
load: true
110-
tags: "${{ env.IMAGE_NAME }}:${{ env.IMAGE_VER }}"
111+
tags: "${{ env.INVOKE_PYNTC_IMAGE_NAME }}:${{ env.INVOKE_PYNTC_IMAGE_VER }}"
111112
file: "./Dockerfile"
112-
cache-from: "type=gha,scope=${{ env.IMAGE_NAME }}-${{ env.IMAGE_VER }}-py${{ matrix.python-version }}"
113-
cache-to: "type=gha,scope=${{ env.IMAGE_NAME }}-${{ env.IMAGE_VER }}-py${{ matrix.python-version }}"
113+
cache-from: "type=gha,scope=${{ env.INVOKE_PYNTC_IMAGE_NAME }}-${{ env.INVOKE_PYNTC_IMAGE_VER }}-py${{ matrix.python-version }}"
114+
cache-to: "type=gha,scope=${{ env.INVOKE_PYNTC_IMAGE_NAME }}-${{ env.INVOKE_PYNTC_IMAGE_VER }}-py${{ matrix.python-version }}"
114115
build-args: |
115116
PYTHON_VER=${{ env.PYTHON_VER }}
116117
- name: "Debug: Show docker images"
@@ -131,7 +132,7 @@ jobs:
131132
- name: "Setup environment"
132133
uses: "networktocode/gh-action-setup-poetry-environment@v6"
133134
- name: "Get image version"
134-
run: "echo IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
135+
run: "echo INVOKE_PYNTC_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
135136
- name: "Set up Docker Buildx"
136137
id: "buildx"
137138
uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
@@ -142,10 +143,10 @@ jobs:
142143
context: "./"
143144
push: false
144145
load: true
145-
tags: "${{ env.IMAGE_NAME }}:${{ env.IMAGE_VER }}"
146+
tags: "${{ env.INVOKE_PYNTC_IMAGE_NAME }}:${{ env.INVOKE_PYNTC_IMAGE_VER }}"
146147
file: "./Dockerfile"
147-
cache-from: "type=gha,scope=${{ env.IMAGE_NAME }}-${{ env.IMAGE_VER }}-py${{ matrix.python-version }}"
148-
cache-to: "type=gha,scope=${{ env.IMAGE_NAME }}-${{ env.IMAGE_VER }}-py${{ matrix.python-version }}"
148+
cache-from: "type=gha,scope=${{ env.INVOKE_PYNTC_IMAGE_NAME }}-${{ env.INVOKE_PYNTC_IMAGE_VER }}-py${{ matrix.python-version }}"
149+
cache-to: "type=gha,scope=${{ env.INVOKE_PYNTC_IMAGE_NAME }}-${{ env.INVOKE_PYNTC_IMAGE_VER }}-py${{ matrix.python-version }}"
149150
build-args: |
150151
PYTHON_VER=${{ env.PYTHON_VER }}
151152
- name: "Debug: Show docker images"

example.invoke.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ pyntc:
33
python_ver: "3.11"
44
# local: false
55
# image_name: "pyntc"
6-
# image_ver: "2.0.2"
6+
# image_ver: "latest"
77
# pwd: "."

tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def is_truthy(arg):
3636
"python_ver": "3.12",
3737
"local": False,
3838
"image_name": "pyntc",
39-
"image_ver": "2.0.2",
39+
"image_ver": "latest",
4040
"pwd": ".",
4141
}
4242
}

0 commit comments

Comments
 (0)