Merge pull request rust-serverless#2 from micrictor/master

- fix test image reference

Author: zamazan4ik

.github/workflows/main.yml

@@ -4,11 +4,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - 'v**'
-  pull_request:
-    branches:
-      - master
 
 jobs:
   test:
@@ -17,18 +12,6 @@ jobs:
       - uses: actions/checkout@v1
       - name: Test
         run: make test
-  publish-docs:
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Update Docker hub metadata
-        uses: docker://mpepping/docker-hub-metadata-github-action
-        env:
-          IMAGE: ${{ github.repository }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        continue-on-error: true
   publish:
     needs: [test]
     runs-on: ubuntu-latest
@@ -37,8 +20,7 @@ jobs:
       - name: Build
         shell: bash
         run: make build
-      - name: Publish
-        if: startsWith(github.ref, 'refs/tags/')
+      - name: Publish Latest
         shell: bash
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin

.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release publishing
+
+on:
+  release:
+    types:
+     - published
+
+jobs:
+  publish-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Update Docker hub metadata
+        uses: docker://mpepping/docker-hub-metadata-github-action
+        env:
+          IMAGE: rustserverless/lambda-rust
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        continue-on-error: true
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build
+        shell: bash
+        run: make build
+      - name: Publish
+        shell: bash
+        with:
+          release_tag: ${{ github.event.release.tag_name }}
+        run: |
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+          make publish-tag

.github/workflows/untrusted.yml

@@ -0,0 +1,14 @@
+name: Untrusted workflows (PRs)
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Test
+        run: make test

Makefile

@@ -1,16 +1,16 @@
 DOCKER ?= docker
-VERSION ?= 0.4.0
 RUST_VERSION ?= 1.54.0
 REPO ?= rustserverless/lambda-rust
-TAG ?= "$(REPO):$(VERSION)-rust-$(RUST_VERSION)"
 
 publish: build
-	$(DOCKER) push $(TAG)
 	$(DOCKER) push $(REPO):latest
 
+publish-tag: build publish
+	$(DOCKER) tag $(REPO):latest "$(REPO):$(INPUT_RELEASE_VERSION)-rust-$(RUST_VERSION)"
+	$(DOCKER) push "$(REPO):$(INPUT_RELEASE_VERSION)-rust-$(RUST_VERSION)"
+
 build:
-	$(DOCKER) build --build-arg RUST_VERSION=$(RUST_VERSION) -t $(TAG) .
-	$(DOCKER) tag $(TAG) $(REPO):latest
+	$(DOCKER) build --build-arg RUST_VERSION=$(RUST_VERSION) -t $(REPO):latest .
 
 test:
 	@tests/test.sh

tests/test.sh

@@ -4,7 +4,7 @@
 HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # Root directory of the repository
 DIST=$(cd "$HERE"/..; pwd)
-IMAGE=${1:-softprops/lambda-rust}
+IMAGE=${1:-rustserverless/lambda-rust}
 
 source "${HERE}"/bashtest.sh