Skip to content

Move to Feedz #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 28, 2023
Merged

Move to Feedz #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2395be7
Move to Feedz
StuartFerguson Jul 28, 2023
ecd3282
..
StuartFerguson Jul 28, 2023
2268d6e
.
StuartFerguson Jul 28, 2023
102fcc4
.
StuartFerguson Jul 28, 2023
1872f5e
update workflows
StuartFerguson Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/buildwindowsimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
- name: Publish Images to Docker Hub - Pre Release
if: ${{ github.event.release.prerelease == true }}
run: |
docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:dev --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:dev
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
docker push stuartferguson/messagingservicewindows:dev
- name: Publish Images to Docker Hub - Formal Release
if: ${{ github.event.release.prerelease == false }}
run: |
docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:latest
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
docker push stuartferguson/messagingservicewindows:latest
6 changes: 2 additions & 4 deletions .github/workflows/createrelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

- name: Restore Nuget Packages
env:
GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
Expand All @@ -37,14 +35,14 @@ jobs:
- name: Publish Images to Docker Hub - Pre Release
if: ${{ github.event.release.prerelease == true }}
run: |
docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:dev --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:dev
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
docker push stuartferguson/messagingservice:dev

- name: Publish Images to Docker Hub - Formal Release
if: ${{ github.event.release.prerelease == false }}
run: |
docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:latest
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
docker push stuartferguson/messagingservice:latest

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/nightlybuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ jobs:
run: echo "action_url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV

- name: Restore Nuget Packages
env:
GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
Expand All @@ -70,7 +68,7 @@ jobs:
files: ./lcov1.info,./lcov2.info,./lcov3.info,./lcov4.info

- name: Build Docker Image
run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest

- name: Run Integration Tests
run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj"
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
- uses: actions/checkout@v2.3.4

- name: Restore Nuget Packages
env:
GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/pushtomaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
fetch-depth: 0

- name: Restore Nuget Packages
env:
GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}

- name: Build Code
Expand Down Expand Up @@ -53,7 +51,7 @@ jobs:

- name: Publish Images to Docker Hub
run: |
docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:master --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:master
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
docker push stuartferguson/messagingservice:master

Expand All @@ -71,6 +69,6 @@ jobs:

- name: Publish Windows Images to Docker Hub
run: |
docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:master --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:master
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
docker push stuartferguson/messagingservicewindows:master
1 change: 0 additions & 1 deletion .github/workflows/sonarcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
shell: powershell
run: |
.\.sonar\scanner\dotnet-sonarscanner begin /k:"TransactionProcessing_Messaging" /o:"transactionprocessing" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
Expand Down
3 changes: 0 additions & 3 deletions MessagingService/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ARG NUGET_TOKEN

WORKDIR /src
COPY ["MessagingService/NuGet.Config", "."]
# Replace the placeholders in the NuGet.config file with the GitHub Secret
RUN sed -i "s|NUGET_TOKEN|${NUGET_TOKEN}|g" NuGet.Config

COPY ["MessagingService/MessagingService.csproj", "MessagingService/"]
COPY ["MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj", "MessagingService.BusinessLogic/"]
COPY ["MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj", "MessagingService.EmailMessageAggregate/"]
Expand Down
3 changes: 0 additions & 3 deletions MessagingService/Dockerfilewindows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ ARG NUGET_TOKEN

WORKDIR /src
COPY ["MessagingService/NuGet.Config", "."]
# Replace the placeholders in the NuGet.config file with the GitHub Secret
RUN powershell -Command "(Get-Content NuGet.Config) -replace 'NUGET_TOKEN', '${env:NUGET_TOKEN}' | Set-Content NuGet.Config"

COPY ["MessagingService/MessagingService.csproj", "MessagingService/"]
COPY ["MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj", "MessagingService.BusinessLogic/"]
COPY ["MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj", "MessagingService.EmailMessageAggregate/"]
Expand Down
10 changes: 5 additions & 5 deletions MessagingService/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="GitHub" value="https://nuget.pkg.github.com/TransactionProcessing/index.json" />
<add key="Feedz" value="https://f.feedz.io/transactionprocessing/nugets/nuget/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<packageSourceCredentials>
<GitHub>
<add key="Username" value="stuart_ferguson1development@outlook.com"/>
<add key="ClearTextPassword" value="NUGET_TOKEN" />
</GitHub>
<Feedz>
<add key="Username" value="TestUser"/>
<add key="ClearTextPassword" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
</Feedz>
</packageSourceCredentials>
<packageRestore>
<add key="enabled" value="True" />
Expand Down
10 changes: 5 additions & 5 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="GitHub" value="https://nuget.pkg.github.com/TransactionProcessing/index.json" />
<add key="Feedz" value="https://f.feedz.io/transactionprocessing/nugets/nuget/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<packageSourceCredentials>
<GitHub>
<add key="Username" value="stuart_ferguson1development@outlook.com"/>
<add key="ClearTextPassword" value="%GITHUBTOKEN%" />
</GitHub>
<Feedz>
<add key="Username" value="TestUser"/>
<add key="ClearTextPassword" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
</Feedz>
</packageSourceCredentials>
<packageRestore>
<add key="enabled" value="True" />
Expand Down