Skip to content

Commit

Permalink
Merge pull request #750 from Crypter-File-Transfer/stable
Browse files Browse the repository at this point in the history
Merge 'stable' into 'main'
  • Loading branch information
Jack-Edwards authored Jan 11, 2025
2 parents 11222e6 + 969dae9 commit 72e5449
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-push-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,28 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.registry }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.registry }}/${{ vars.API_IMAGE_NAME }}
flavor: |
latest=${{ (github.event_name == 'workflow_dispatch' && 'true') || 'auto' }}
- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: ./Crypter.API/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand Down
2 changes: 1 addition & 1 deletion Crypter.Common/Crypter.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<LangVersion>12</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyMonads" Version="2.2.0" />
<PackageReference Include="EasyMonads" Version="2.4.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
<PackageReference Include="ValueOf" Version="2.0.31" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions Crypter.Test.Web/Crypter.Test.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EasyMonads" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.1" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Crypter.Test/Crypter.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.1" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Respawn" Version="6.2.1" />
Expand Down

0 comments on commit 72e5449

Please sign in to comment.