From 348668f273550a1a657b74ade0f3e1390fd33b59 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 18 May 2020 17:22:47 -0600 Subject: [PATCH 1/5] update action to login to docker hub --- .github/workflows/docker.yml | 6 ++++++ .github/workflows/master.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b29d3cb..945ecfa 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,6 +51,12 @@ jobs: run: | Write-Output ${{ env.VERSION }} ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }} + # Login to Docker + - name: Login to Docker + uses: azure/docker-login@v1 + with: + username: ${{ secrets.dockerhub_password }} + password: ${{ secrets.dockerhub_user }} # Build the solutions in the docker image - name: Build Solution shell: powershell diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 22a1deb..110e18a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -47,6 +47,12 @@ jobs: run: | Write-Output ${{ env.VERSION }} ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }} + # Login to Docker + - name: Login to Docker + uses: azure/docker-login@v1 + with: + username: ${{ secrets.dockerhub_password }} + password: ${{ secrets.dockerhub_user }} # Build the solutions in the docker image - name: Build Solution shell: powershell From 34951eb8d0bb8ae01969315380c21a9ea8cd8c06 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 18 May 2020 17:27:52 -0600 Subject: [PATCH 2/5] moves fields to the correct places --- .github/workflows/master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 110e18a..13db798 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -51,8 +51,8 @@ jobs: - name: Login to Docker uses: azure/docker-login@v1 with: - username: ${{ secrets.dockerhub_password }} - password: ${{ secrets.dockerhub_user }} + username: ${{ secrets.dockerhub_user }} + password: ${{ secrets.dockerhub_password }} # Build the solutions in the docker image - name: Build Solution shell: powershell From 9b56d55c9097cacc055cf76537a295880074ab98 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 18 May 2020 17:29:24 -0600 Subject: [PATCH 3/5] fixes in docker.yml for fields in the wrong spot --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 945ecfa..e7b19e6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -55,8 +55,8 @@ jobs: - name: Login to Docker uses: azure/docker-login@v1 with: - username: ${{ secrets.dockerhub_password }} - password: ${{ secrets.dockerhub_user }} + username: ${{ secrets.dockerhub_user }} + password: ${{ secrets.dockerhub_password }} # Build the solutions in the docker image - name: Build Solution shell: powershell From 48b564fb864401f31406faeb219dd58b30a01d9c Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 18 May 2020 17:34:15 -0600 Subject: [PATCH 4/5] remove get tags in Master.yml --- .github/workflows/master.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 13db798..7a6135c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -32,9 +32,6 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - # Fetch all tags - - name: Fetch tags - run: git fetch --tags # Generate the appropriate version number - name: Set Version Number shell: powershell From 3ad222527ef460f7a61790a99130f40a86c9acb3 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 18 May 2020 17:43:03 -0600 Subject: [PATCH 5/5] updates docker.yml to only create a release for RC and hotfix builds --- .github/workflows/docker.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e7b19e6..33c0c2d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -82,9 +82,16 @@ jobs: name: Version path: ${{env.GITHUB_HOME}}\output\version.txt # Create the release on the source repo + - name: Create tag for non-rc builds + if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta') + run: | + git tag $($Env:VERSION) + git push --tags origin - name: Create Release id: create_release - uses: actions/create-release@v1 + # using contributor's version to allow for pointing at the right commit + if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-') + uses: fleskesvor/create-release@feature/support-target-commitish with: tag_name: ${{ env.VERSION }} release_name: ${{ env.VERSION }} @@ -93,6 +100,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Upload the build package to the release - name: Upload Release Package + if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-') id: upload_release uses: actions/upload-release-asset@v1 with: