Skip to content

Commit

Permalink
Merge pull request #808 from EdiWang/master
Browse files Browse the repository at this point in the history
v14.7.0
  • Loading branch information
EdiWang authored Aug 14, 2024
2 parents e7c14c5 + e261843 commit 5653886
Show file tree
Hide file tree
Showing 67 changed files with 1,221 additions and 857 deletions.
38 changes: 0 additions & 38 deletions .azure/build-release.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/docker-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ jobs:
uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

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

- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./
file: ./Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ jobs:
uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

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

- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./
file: ./Dockerfile
Expand Down
70 changes: 70 additions & 0 deletions .github/workflows/webapp-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Azure Web App (PROD)

env:
AZURE_WEBAPP_NAME: moonglade-ediwang-us
AZURE_WEBAPP_PACKAGE_PATH: '.'
DOTNET_VERSION: '8'

on:
workflow_dispatch:

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Set up dependency caching for faster builds
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Build with dotnet
working-directory: ./src/Moonglade.Web
run: dotnet build --configuration Release

- name: dotnet publish
working-directory: ./src/Moonglade.Web
run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/moonglade-release

- name: Upload artifact for deployment job
uses: actions/upload-artifact@v4
with:
name: .net-app
path: ${{env.DOTNET_ROOT}}/moonglade-release

deploy:
permissions:
contents: none
runs-on: ubuntu-latest
needs: build
environment:
name: 'Production'
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v4
with:
name: .net-app

- name: Deploy to Azure Web App
id: deploy-to-webapp
uses: azure/webapps-deploy@v3
with:
app-name: ${{ env.AZURE_WEBAPP_NAME }}
clean: true
publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,10 @@ paket-files/
__pycache__/
*.pyc
*.txt

# Build time files
**/lib/tinymce
**/lib/moonglade-monaco

# Special files need to be included
!/package-src/Moonglade.MonacoEditor.*.nupkg
Loading

0 comments on commit 5653886

Please sign in to comment.