Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ghost1372 committed May 19, 2024
2 parents 905d65b + 2155d1d commit debda1f
Show file tree
Hide file tree
Showing 32 changed files with 636 additions and 351 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build
name: Build

on:
push:
Expand All @@ -23,7 +23,9 @@ jobs:
include-prerelease: true

- name: Build
shell: pwsh
working-directory: ./build
run: |
cd build
.\build.ps1
dotnet new tool-manifest
dotnet tool install cake.tool --version 4.0.0
dotnet tool install minver-cli --version 3.0.0
dotnet cake
45 changes: 45 additions & 0 deletions .github/workflows/bump-up-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Bump up version

on:
workflow_dispatch:
inputs:
pre_release:
description: 'is preview'
type: boolean
required: true
default: false

jobs:
bump-up-version:
runs-on: windows-latest
steps:
- name: Checkout repo
uses: actions/checkout@master
with:
ref: ${{ github.head_ref }}

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@master
with:
dotnet-version: '8.0.x'
include-prerelease: true

- name: Publish
working-directory: ./build
run: |
git config --local user.name "${{ github.actor }}"
git config --local user.email "[email protected]"
dotnet new tool-manifest
dotnet tool install cake.tool --version 4.0.0
dotnet tool install minver-cli --version 3.0.0
dotnet cake --username="${{ github.actor }}" --email="[email protected]" --pre-release=${{ inputs.pre_release }}
- name: Push git changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ github.ref }}
tags: true

- name: Push to nuget
run: dotnet nuget push ./build/outputs/nuget/*nupkg -k ${{ secrets.NUGETTOKEN }}
17 changes: 3 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
.vs
.config
*.user
*.xml
[Bb]in/
[Oo]bj/
packages/
build/*
!build/build.cake
!build/build.Lang.template
!build/create_lang_nuspec_file.py
!build/create_nupkg_file.ps1
!build/build.ps1
!build/version-bump-up-manual.md
!build/LICENSE
!build/icon.png
!build/tools/
build/tools/*
!build/tools/packages.config
!build/tools/VisualStudioToolsManifest.xml
build/outputs
build/tools
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
MIT License

Copyright (c) 2018-2024 HandyOrg
Copyright © HandyOrg 2018-2024

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 0 additions & 21 deletions build/LICENSE

This file was deleted.

File renamed without changes.
61 changes: 0 additions & 61 deletions build/build.Lang.template

This file was deleted.

Loading

0 comments on commit debda1f

Please sign in to comment.