Feature/platforms (#6)

* fix output path * kick the build * fix workflow * fix image tag Co-authored-by: George Polevoy <[email protected]>
dodopizza · Aug 6, 2020 · 4222b14 · 4222b14
1 parent c371a9d
commit 4222b14
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -20,15 +20,15 @@ jobs:
           dockerfile: platforms.Dockerfile
           push: false
           repository: dodopizza/mysql-data-mover-platforms
-          tags: test
+          tags: test,latest
 
       - name: Build linux image
-          uses: docker/build-push-action@v1
-          with:
-            dockerfile: linux.Dockerfile
-            push: false
-            repository: dodopizza/mysql-data-mover
-            tags: test
+        uses: docker/build-push-action@v1
+        with:
+          dockerfile: linux.Dockerfile
+          push: false
+          repository: dodopizza/mysql-data-mover
+          tags: test,latest
 
       - name: Integration test
         timeout-minutes: 10

diff --git a/.github/workflows/on-push-to-master.yml b/.github/workflows/on-push-to-master.yml
@@ -49,11 +49,11 @@ jobs:
         run: |
           mkdir ./output
           id=$( docker create dodopizza/mysql-data-mover-platforms:latest )
-          docker cp $id:/app/output/linux-x64/ ./output
+          docker cp $id:/output/linux-x64/ ./output
           docker rm -v $id
           ls -l ./output
           cd ./output
-          zip -r ./mysql-data-mover.linux-x64.zip .
+          zip -r ./mysql-data-mover.${{ steps.common_vars.outputs.app_version }}.linux-x64.zip .
 
       - name: Create draft release
         id: create_release
@@ -72,6 +72,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/mysql-data-mover.linux-x64.zip
-          asset_name: mysql-data-mover-${{ steps.common_vars.outputs.app_version }}.linux-x64.zip
+          asset_path: ./output/mysql-data-mover.${{ steps.common_vars.outputs.app_version }}.linux-x64.zip
+          asset_name: mysql-data-mover.${{ steps.common_vars.outputs.app_version }}.linux-x64.zip
           asset_content_type: application/zip
diff --git a/platforms.Dockerfile b/platforms.Dockerfile
@@ -9,3 +9,4 @@ RUN dotnet publish -r linux-x64 /p:PublishSingleFile=true -c Release --output ./
     dotnet publish -r linux-musl-x64 /p:PublishSingleFile=true -c Release --output ./output/linux-musl-x64 ${SOLUTION_NAME} && \
     dotnet publish -r win-x64 /p:PublishSingleFile=true -c Release --output ./output/win-x64 ${SOLUTION_NAME} && \
     dotnet publish -r osx-x64 /p:PublishSingleFile=true -c Release --output ./output/osx-x64 ${SOLUTION_NAME}
+# kick the build 2020-08-06 15:32