Skip to content

Commit 3b044a6

Browse files
committed
fix: update module push commands in GitHub Actions and Makefile for correct file naming
1 parent a01336c commit 3b044a6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/ghcr_module.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ jobs:
7272
echo "Building specific module: ${{ inputs.module-name }}"
7373
7474
cd graphs/wasm-modules
75-
oras push ghcr.io/$owner/explore-iot-operations/${{ inputs.module-name }}:${{ inputs.module-tag }} ./${{ inputs.module-name }}-${{ inputs.module-tag }}.wasm:application/vnd.wasm.content.layer.v1+wasm --disable-path-validation
75+
oras push ghcr.io/$owner/explore-iot-operations/${{ inputs.module-name }}:${{ inputs.module-tag }} ./${{ inputs.module-name }}.wasm:application/vnd.wasm.content.layer.v1+wasm --disable-path-validation
7676
else
7777
echo "Building all modules"
7878
7979
cd graphs/wasm-modules
8080
for moduleFile in *.wasm; do
81-
moduleName=$(basename "$moduleFile" .wasm | sed 's/-${{ inputs.module-tag }}$//')
81+
moduleName=$(basename "$moduleFile" .wasm)
8282
echo "Pushing module: $moduleName"
83-
oras push ghcr.io/$owner/explore-iot-operations/$moduleName:${{ inputs.module-tag }} ./$moduleName-${{ inputs.module-tag }}.wasm:application/vnd.wasm.content.layer.v1+wasm --disable-path-validation
83+
oras push ghcr.io/$owner/explore-iot-operations/$moduleName:${{ inputs.module-tag }} ./$moduleFile:application/vnd.wasm.content.layer.v1+wasm --disable-path-validation
8484
done
8585
fi

samples/wasm/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ graphs: $(1P_MODULES)
1414
.PHONY: $(1P_MODULES)
1515
$(1P_MODULES):
1616
mkdir -p ./graphs/wasm-modules
17-
$(eval VERSION ?= 1.0.0)
1817
$(eval MODE := $(if $(DEBUG),debug,release))
1918
cd $(REPOSITORY_ROOT)/samples/wasm/operators/$@ && \
2019
cargo build --target wasm32-wasip2 -p $@ $(if $(DEBUG),, --release) $(CARGO_FLAGS)
2120
$(eval file_naming := $(subst -,_,$@))
22-
cp --archive $(REPOSITORY_ROOT)/samples/wasm/operators/$@/target/wasm32-wasip2/$(MODE)/$(file_naming).wasm ./graphs/wasm-modules/$@-$(VERSION).wasm
21+
cp --archive $(REPOSITORY_ROOT)/samples/wasm/operators/$@/target/wasm32-wasip2/$(MODE)/$(file_naming).wasm ./graphs/wasm-modules/$@.wasm

0 commit comments

Comments
 (0)