Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/ZKEACMS/ZKEACMS.csproj
  • Loading branch information
Wayne-KTCSZ committed May 29, 2024
2 parents 2dd29aa + 283b002 commit c4efba5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Install dependencies
Expand All @@ -35,4 +35,4 @@ jobs:
run: |
mkdir ./src/ZKEACMS.WebHost/bin/Release/PublishOutput/App_Data
sqlite-exec -d ./src/ZKEACMS.WebHost/bin/Release/PublishOutput/App_Data/Database.sqlite -f ./Database/SQLite/ZKEACMS.sqlite.sql
cp -f ./Database/SQLite/appsettings.json ./src/ZKEACMS.WebHost/bin/Release/PublishOutput/appsettings.json
cp -f ./Database/SQLite/appsettings.json ./src/ZKEACMS.WebHost/bin/Release/PublishOutput/appsettings.json
8 changes: 4 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- id: docker-tag
uses: yuya-takeyama/docker-tag-from-github-ref-action@v1.0.0
uses: yuya-takeyama/docker-tag-from-github-ref-action@v1
with:
remove-version-tag-prefix: false
- name: Log into registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down

0 comments on commit c4efba5

Please sign in to comment.