Restore simple build script output name

Revert the complicated output name bits from the build script and Actions
workflows. Instead the Actions workflows will handle any fancy asset naming.

Author: mcdonnnj

.github/workflows/build.yml

@@ -121,6 +121,9 @@ jobs:
         python-version: [3.6, 3.7, 3.8]
     steps:
       - uses: actions/checkout@v2
+      - name: Get short SHA for the commit being used
+        run: |
+          echo "GH_SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
       - name: Build Docker image
         run: |
           docker-compose build \
@@ -137,11 +140,12 @@ jobs:
       # to upload a single file as an artifact.
       - name: Unzip generated zip
         run: |
-          unzip ${{ github.event.repository.name }}*.zip \
+          unzip ${{ github.event.repository.name }}.zip \
             -d lambda_zip_contents
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: "${{ github.event.repository.name }}-${{ github.sha }}-\
-            py${{ matrix.python-version }}"
+          name: "${{ github.event.repository.name }}-\
+            py${{ matrix.python-version }}-\
+            ${{ env.GH_SHORT_SHA }}"
           path: lambda_zip_contents/

.github/workflows/release.yml

@@ -7,19 +7,19 @@ on:
 
 env:
   PIP_CACHE_DIR: ~/.cache/pip
-  PY_VERSION: 3.8
 jobs:
   release:
     runs-on: ubuntu-latest
-    env:
-      ASSET_NAME: ${{ github.event.repository.name }}.zip
+    strategy:
+      matrix:
+        # Versions supported by AWS and lambci/lambda images
+        python-version: [3.6, 3.7, 3.8]
     steps:
       - uses: actions/checkout@v2
       - name: Build Docker image
         run: "docker-compose build \
-          --build-arg PY_VERSION=${{ env.PY_VERSION }} \
-          --build-arg FILE_NAME=${{ github.event.repository.name }} \
-          --build-arg IS_RELEASE=TRUE"
+          --build-arg PY_VERSION=${{ matrix.python-version }} \
+          --build-arg FILE_NAME=${{ github.event.repository.name }}"
       - name: Generate lambda zip
         run: docker-compose up
       - name: Upload lambda zip as release asset
@@ -28,6 +28,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ env.ASSET_NAME }}
-          asset_name: ${{ env.ASSET_NAME }}
+          asset_path: "${{ github.event.repository.name }}.zip"
+          asset_name: "${{ github.event.repository.name }}-\
+            ${{ matrix.python-version }}.zip"
           asset_content_type: application/zip

.gitignore

@@ -4,4 +4,4 @@
 .pytest_cache
 .python-version
 __pycache__
-skeleton-aws-lambda*.zip
+skeleton-aws-lambda.zip

Dockerfile

@@ -11,10 +11,8 @@ ARG IS_RELEASE=FALSE
 
 ENV BUILD_PY_VERSION=$PY_VERSION
 ENV BUILD_FILE_NAME=$FILE_NAME
-ENV BUILD_IS_RELEASE=$IS_RELEASE
 
 COPY build.sh .
-COPY bump_version.sh .
 
 COPY lambda_handler.py .
 

build.sh

@@ -22,32 +22,16 @@ function check_dependencies {
   done
 }
 
-PY_VERSION="3.8"
-FILE_NAME="skeleton-aws-lambda"
-
 check_dependencies
 
-if [ -n "$BUILD_PY_VERSION" ]
-then
-  PY_VERSION="$BUILD_PY_VERSION"
-fi
-
-if [ -n "$BUILD_FILE_NAME" ]
-then
-  FILE_NAME="$BUILD_FILE_NAME"
-fi
-
-LAMBDA_VERSION=$(./bump_version.sh show)
+PY_VERSION="${BUILD_PY_VERSION:-3.8}"
+# Use the current directory name
+FILE_NAME="${BUILD_FILE_NAME:-${PWD##*/}}"
 
 ###
 # Define the name of the Lambda zip file being produced.
 ###
-if [ -n "$BUILD_IS_RELEASE" ] && [ "$BUILD_IS_RELEASE" == "TRUE" ]
-then
-  ZIP_FILE="${FILE_NAME}.zip"
-else
-  ZIP_FILE="${FILE_NAME}_${LAMBDA_VERSION}_py${PY_VERSION}.zip"
-fi
+ZIP_FILE="${FILE_NAME}.zip"
 
 ###
 # Set up the Python virtual environment.