Skip to content

Commit c42dec9

Browse files
committed
Change trigger, uncomment test stuff
1 parent fa8342d commit c42dec9

File tree

1 file changed

+30
-34
lines changed

1 file changed

+30
-34
lines changed

.github/workflows/release.yml

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
name: Release
22
on:
3-
# Eventually - commented out for testing in a PR
4-
#push:
5-
# tags:
6-
# - '[0-9]+.[0-9]+.[0-9]+'
7-
# - '[0-9]+.[0-9]+.[0-9]+-*'
8-
pull_request:
3+
push:
4+
tags:
5+
- '[0-9]+.[0-9]+.[0-9]+'
6+
- '[0-9]+.[0-9]+.[0-9]+-*'
97
env:
108
DOTNET_NOLOGO: true
119
# Signals build to create the installer
@@ -118,21 +116,21 @@ jobs:
118116
name: octopus-package
119117
path: octopus-package/*
120118
retention-days: 1
121-
#- name: Push package to Octopus Deploy
122-
# uses: OctopusDeploy/push-package-action@v1.1.1
123-
# with:
124-
# server: https://deploy.particular.net
125-
# api_key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
126-
# packages: octopus-package/${{env.PARTICULAR_REPO_NAME}}.Deploy.${{env.GitVersion_SemVer}}.nupkg
127-
#- name: Create Octopus Deploy release
128-
# uses: OctopusDeploy/create-release-action@v1.1.1
129-
# with:
130-
# server: https://deploy.particular.net
131-
# api_key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
132-
# project: ${{env.PARTICULAR_REPO_NAME}}
133-
# release_number: ${{env.GitVersion_SemVer}}
134-
# package_version: ${{env.GitVersion_SemVer}}
135-
# package: "GitReleaseManager:0.11.0"
119+
- name: Push package to Octopus Deploy
120+
uses: OctopusDeploy/push-package-action@v1.1.1
121+
with:
122+
server: https://deploy.particular.net
123+
api_key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
124+
packages: octopus-package/${{env.PARTICULAR_REPO_NAME}}.Deploy.${{env.GitVersion_SemVer}}.nupkg
125+
- name: Create Octopus Deploy release
126+
uses: OctopusDeploy/create-release-action@v1.1.1
127+
with:
128+
server: https://deploy.particular.net
129+
api_key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
130+
project: ${{env.PARTICULAR_REPO_NAME}}
131+
release_number: ${{env.GitVersion_SemVer}}
132+
package_version: ${{env.GitVersion_SemVer}}
133+
package: "GitReleaseManager:0.11.0"
136134
docker:
137135
needs: release
138136
name: docker-${{ matrix.name }}
@@ -170,8 +168,6 @@ jobs:
170168
with:
171169
name: zips
172170
path: zip
173-
- name: Temp ls -R
174-
run: ls -R ./zip
175171
- name: Prepare directory structure
176172
shell: pwsh
177173
run: |
@@ -206,11 +202,16 @@ jobs:
206202
$dockerbuildcmd = "docker build -t particular/" + $dockerImageName +":${{ needs.release.outputs.semver }}" + " -f .\src\docker\" + $_.Name + " ."
207203
Invoke-Expression $dockerbuildcmd.ToLower()
208204
}
209-
#- name: Login to Docker Hub
210-
# uses: docker/login-action@v1.10.0
211-
# with:
212-
# username: ${{ secrets.DOCKERHUB_USERNAME }}
213-
# password: ${{ secrets.DOCKERHUB_TOKEN }}
205+
- name: Login to Docker Hub
206+
uses: docker/login-action@v1.10.0
207+
with:
208+
username: ${{ secrets.DOCKERHUB_USERNAME }}
209+
password: ${{ secrets.DOCKERHUB_TOKEN }}
210+
- name: Diagnostics
211+
shell: pwsh
212+
run: |
213+
# List out the docker images on the system
214+
docker images
214215
- name: Push Docker images
215216
shell: pwsh
216217
run: |
@@ -219,10 +220,5 @@ jobs:
219220
220221
$dockerpushcmd = "docker push particular/" + $dockerImageName +":${{ needs.release.outputs.semver }}"
221222
echo "Docker Push Command: $dockerpushcmd"
222-
# Invoke-Expression $dockerpushcmd.ToLower()
223+
Invoke-Expression $dockerpushcmd.ToLower()
223224
}
224-
- name: Diagnostics
225-
shell: pwsh
226-
run: |
227-
# List out the docker images on the system
228-
docker images

0 commit comments

Comments
 (0)