@@ -130,25 +130,23 @@ jobs:
130
130
ARCH_NAME=$(echo ${{ matrix.architecture }} | tr -d '_')
131
131
SAR_NAME="${SAR_NAME}-python${{env.PYTHON_VERSION}}-${ARCH_NAME}"
132
132
echo SAR_NAME="${SAR_NAME}" >> "$GITHUB_ENV"
133
- - name : Normalize semantic version
134
- id : semantic-version # v2.0.0a0 -> v2.0.0-a0
135
- env :
136
- VERSION : ${{ inputs.package-version }}
137
- run : |
138
- VERSION="${VERSION/a/-a}"
139
- echo "VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
140
133
- name : Prepare SAR App
141
- env :
142
- VERSION : ${{ steps.semantic-version.outputs.VERSION }}
143
134
run : |
144
135
# From the generated LayerStack cdk.out artifact, find the layer asset path for the correct architecture.
145
136
# We'll use this as the source directory of our SAR. This way we are re-using the same layer asset for our SAR.
146
137
PYTHON_VERSION=$(echo ${{ matrix.python-version }} | tr -d '.')
147
- asset=$(jq -jc '.Resources[] | select(.Properties.CompatibleArchitectures == ["${{ matrix.architecture }}"]) | .Metadata."aws:asset:path"' "cdk.out/LayerV3Stack-python${PYTHON_VERSION}.template.json")
138
+ asset_cdk=$(jq -jc '.Resources[] | select(.Properties.CompatibleArchitectures == ["${{ matrix.architecture }}"]) | .Metadata."aws:asset:path"' "cdk.out/LayerV3Stack-python${PYTHON_VERSION}.template.json")
139
+
140
+ echo "Normalizing the asset variable"
141
+ asset=$(echo $asset_cdk | sed -E 's/^(asset\.[^.]+).*\1/\1/')
142
+
143
+ VERSION=$(echo ${{ inputs.package-version }} | sed 's/^v//')
144
+ echo $asset
145
+ echo $VERSION
148
146
149
147
# fill in the SAR SAM template
150
148
sed \
151
- -e "s|<VERSION>|${{ env. VERSION } }|g" \
149
+ -e "s|<VERSION>|${VERSION}|g" \
152
150
-e "s/<SAR_APP_NAME>/${{ env.SAR_NAME }}/g" \
153
151
-e "s|<LAYER_CONTENT_PATH>|./cdk.out/$asset|g" \
154
152
-e "s|<PYTHON_RUNTIME>|${{ matrix.python-version }}|g" \
0 commit comments