Skip to content

Commit ef83ff2

Browse files
committed
simplify script again
1 parent fa17267 commit ef83ff2

1 file changed

Lines changed: 2 additions & 19 deletions

File tree

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

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ on:
1111
description: "Version tag for the release (required if publish is true)"
1212
required: false
1313
type: string
14-
registry:
15-
description: "Container registry (docker.io, ghcr.io, etc.)"
16-
required: false
17-
type: string
18-
default: ""
1914
registry_namespace:
2015
description: "Registry namespace/organization"
2116
required: false
@@ -123,7 +118,6 @@ jobs:
123118
env:
124119
INPUT_VERSION: ${{ inputs.version }}
125120
INPUT_PUBLISH: ${{ inputs.publish }}
126-
INPUT_REGISTRY: ${{ inputs.registry }}
127121
INPUT_REGISTRY_NAMESPACE: ${{ inputs.registry_namespace }}
128122
INPUT_IMAGE_NAME: ${{ inputs.image_name }}
129123
REPO_OWNER: ${{ github.repository_owner }}
@@ -132,9 +126,7 @@ jobs:
132126
script: |
133127
const inputVersion = process.env.INPUT_VERSION;
134128
const inputPublish = process.env.INPUT_PUBLISH;
135-
const inputRegistry = process.env.INPUT_REGISTRY;
136129
const inputRegistryNamespace = process.env.INPUT_REGISTRY_NAMESPACE;
137-
const inputImageName = process.env.INPUT_IMAGE_NAME;
138130
const repoOwner = process.env.REPO_OWNER;
139131
140132
// Get git information
@@ -155,19 +147,10 @@ jobs:
155147
}
156148
core.setOutput('version', version);
157149
158-
// Determine registry (with auto-detection for temporalio vs forks)
159-
let registry = inputRegistry;
160-
161150
// Set namespace (defaults to repository owner)
162151
const namespace = inputRegistryNamespace || repoOwner;
163152
core.setOutput('image_namespace', namespace);
164153
165-
// Set image name (defaults to 'temporal')
166-
const imageName = inputImageName || 'temporal';
167-
core.setOutput('image_name', imageName);
168-
169-
console.log(`Namespace: ${namespace}, Image: ${imageName}`);
170-
171154
- name: Build Docker image
172155
if: ${{ !inputs.publish }}
173156
run: |
@@ -179,7 +162,7 @@ jobs:
179162
IMAGE_SHA_TAG: ${{ steps.meta.outputs.image_sha_tag }}
180163
VERSION: ${{ steps.meta.outputs.version }}
181164
TAG_LATEST: false
182-
IMAGE_NAMESPACE: ${{ steps.meta.outputs.image_namespace }}
165+
IMAGE_NAMESPACE: ${{ inputs.registry_namespace }}
183166
IMAGE_NAME: ${{ steps.meta.outputs.image_name }}
184167
GITHUB_REPOSITORY: ${{ github.repository }}
185168

@@ -203,6 +186,6 @@ jobs:
203186
VERSION: ${{ steps.meta.outputs.version }}
204187
TAG_LATEST: ${{ steps.check_latest_release.outputs.is_latest == 'true' }}
205188
IMAGE_NAMESPACE: ${{ steps.meta.outputs.image_namespace }}
206-
IMAGE_NAME: ${{ steps.meta.outputs.image_name }}
189+
IMAGE_NAME: ${{ inputs.image_name }}
207190
GITHUB_REPOSITORY: ${{ github.repository }}
208191

0 commit comments

Comments
 (0)