Skip to content

Commit e63da45

Browse files
Merge pull request #531 from TransactionProcessing/task/#530_workflow_tweaks
Fix Docker tags, test steps, and trace log paths in CI
2 parents e4696cb + 8d41c5c commit e63da45

5 files changed

Lines changed: 7 additions & 15 deletions

File tree

.github/workflows/buildwindowsimage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
run: |
2525
docker build . --file EstateReportingAPI/Dockerfilewindows --tag stuartferguson/estatereportingapiwindows:dev
2626
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
27-
docker push stuartferguson/estatereportingapi:dev
27+
docker push stuartferguson/estatereportingapiwindows:dev
2828
2929
- name: Publish Images to Docker Hub - Formal Release
3030
if: ${{ github.event.release.prerelease == false }}
3131
run: |
3232
docker build . --file EstateReportingAPI/Dockerfilewindows --tag stuartferguson/estatereportingapiwindows:latest
3333
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
34-
docker push stuartferguson/estatereportingapi:latest
34+
docker push stuartferguson/estatereportingapiwindows:latest

.github/workflows/createrelease.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ jobs:
2323
run: dotnet restore EstateReportingAPI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
2424

2525
- name: Build Code
26-
run: dotnet build EstateReportingAPI.sln --configuration Release
27-
28-
- name: Run Unit Tests
29-
run: |
30-
echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
31-
dotnet test "EstateReportingAPI.Tests\EstateReportingAPI.Tests.csproj"
26+
run: dotnet build EstateReportingAPI.sln --configuration Release
3227

3328
- name: Publish Images to Docker Hub - Pre Release
3429
if: ${{ github.event.release.prerelease == true }}

.github/workflows/nightlybuild.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ jobs:
3838
dotnet test "EstateReportingAPI.IntegrationTests\EstateReportingAPI.IntegrationTests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov2.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"
3939
4040
- uses: actions/upload-artifact@v4
41-
if: ${{ failure() }}
4241
with:
4342
name: tracelogs
44-
path: /home/txnproc/trace/
43+
path: /home/runner/trace/
4544

4645
- uses: dacbd/create-issue-action@main
4746
if: ${{ failure() }}

.github/workflows/pullrequest.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
dotnet test "EstateReportingAPI.IntegrationTests\EstateReportingAPI.IntegrationTests.csproj"
3333
3434
- uses: actions/upload-artifact@v4
35-
if: ${{ failure() }}
3635
with:
3736
name: tracelogs
38-
path: /home/txnproc/trace/
37+
path: /home/runner/trace/

EstateReportingAPI/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ RUN dotnet publish "EstateReportingAPI.csproj" -c Release -o /app/publish /p:Use
2020

2121
FROM base AS final
2222
WORKDIR /app
23-
COPY --from=publish --chown=10001:10001 /app/publish .
24-
USER 10001:10001
25-
ENTRYPOINT ["dotnet", "EstateReportingAPI.dll"]
23+
COPY --from=publish /app/publish .
24+
ENTRYPOINT ["dotnet", "EstateReportingAPI.dll"]

0 commit comments

Comments
 (0)