Skip to content

Commit b26b869

Browse files
authored
Merge branch 'master' into beta
2 parents 663b474 + 0784ffe commit b26b869

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Build managed
4646
run: |
4747
cd managed
48-
dotnet build -c Release -p:Version=${{ needs.versioning.outputs.fullSemVer }} -p:InformationalVersion=${{ needs.versioning.outputs.informationalVersion }} -p:FileVersion=${{ needs.versioning.outputs.semVer }}
48+
dotnet build -c Release -p:Version=${{ needs.versioning.outputs.semVer }} -p:InformationalVersion=${{ needs.versioning.outputs.informationalVersion }} -p:FileVersion=${{ needs.versioning.outputs.semVer }}
4949
- name: Upload plugin as artifact
5050
uses: actions/upload-artifact@v4
5151
with:
@@ -77,7 +77,7 @@ jobs:
7777
xmake f --cc=gcc-14 --cxx=g++-14 -y
7878
xmake build -y
7979
env:
80-
SWIFTLY_VERSION: ${{ needs.versioning.outputs.fullSemVer }}
80+
SWIFTLY_VERSION: ${{ needs.versioning.outputs.semVer }}
8181
- name: Upload plugin as artifact
8282
uses: actions/upload-artifact@v4
8383
with:
@@ -102,7 +102,7 @@ jobs:
102102
run: |
103103
xmake build -y
104104
env:
105-
SWIFTLY_VERSION: ${{ needs.versioning.outputs.fullSemVer }}
105+
SWIFTLY_VERSION: ${{ needs.versioning.outputs.semVer }}
106106
- name: Upload plugin as artifact
107107
uses: actions/upload-artifact@v4
108108
with:
@@ -118,8 +118,8 @@ jobs:
118118
needs: [versioning, linux_core, windows_core, managed]
119119
runs-on: ubuntu-latest
120120
env:
121-
LINUX_FOLDER: swiftlys2-linux-v${{ needs.versioning.outputs.fullSemVer }}
122-
WINDOWS_FOLDER: swiftlys2-windows-v${{ needs.versioning.outputs.fullSemVer }}
121+
LINUX_FOLDER: swiftlys2-linux-v${{ needs.versioning.outputs.semVer }}
122+
WINDOWS_FOLDER: swiftlys2-windows-v${{ needs.versioning.outputs.semVer }}
123123
steps:
124124
- name: Download artifacts
125125
uses: actions/download-artifact@v4
@@ -171,7 +171,7 @@ jobs:
171171
- name: Upload package
172172
uses: actions/upload-artifact@v4
173173
with:
174-
name: swiftlys2-package-${{ needs.versioning.outputs.fullSemVer }}
174+
name: swiftlys2-package-${{ needs.versioning.outputs.semVer }}
175175
path: |
176176
${{ env.LINUX_FOLDER }}.zip
177177
${{ env.WINDOWS_FOLDER }}.zip
@@ -189,8 +189,8 @@ jobs:
189189
fetch-depth: 0
190190
- name: Create tag
191191
run: |
192-
TAG_NAME="v${{ needs.versioning.outputs.fullSemVer }}"
193-
MSG="Release v${{ needs.versioning.outputs.fullSemVer }}"
192+
TAG_NAME="v${{ needs.versioning.outputs.semVer }}"
193+
MSG="Release v${{ needs.versioning.outputs.semVer }}"
194194
195195
git config --global user.name "github-actions[bot]"
196196
git config --global user.email "github-actions[bot]@users.noreply.github.com"
@@ -204,22 +204,22 @@ jobs:
204204
- name: Download artifacts
205205
uses: actions/download-artifact@v4
206206
with:
207-
name: swiftlys2-package-${{ needs.versioning.outputs.fullSemVer }}
207+
name: swiftlys2-package-${{ needs.versioning.outputs.semVer }}
208208
path: ./release
209209

210210
- name: Create release
211211
uses: softprops/action-gh-release@v2
212212
with:
213213
generate_release_notes: true
214214
files: |
215-
release/swiftlys2-linux-v${{ needs.versioning.outputs.fullSemVer }}.zip
216-
release/swiftlys2-windows-v${{ needs.versioning.outputs.fullSemVer }}.zip
217-
release/swiftlys2-linux-v${{ needs.versioning.outputs.fullSemVer }}-with-runtimes.zip
218-
release/swiftlys2-windows-v${{ needs.versioning.outputs.fullSemVer }}-with-runtimes.zip
215+
release/swiftlys2-linux-v${{ needs.versioning.outputs.semVer }}.zip
216+
release/swiftlys2-windows-v${{ needs.versioning.outputs.semVer }}.zip
217+
release/swiftlys2-linux-v${{ needs.versioning.outputs.semVer }}-with-runtimes.zip
218+
release/swiftlys2-windows-v${{ needs.versioning.outputs.semVer }}-with-runtimes.zip
219219
prerelease: ${{ needs.versioning.outputs.preReleaseLabel != '' }}
220-
tag_name: v${{ needs.versioning.outputs.fullSemVer }}
221-
name: Release v${{ needs.versioning.outputs.fullSemVer }}
222-
body: ${{ needs.versioning.outputs.fullSemVer }}
220+
tag_name: v${{ needs.versioning.outputs.semVer }}
221+
name: Release v${{ needs.versioning.outputs.semVer }}
222+
body: ${{ needs.versioning.outputs.semVer }}
223223
nuget:
224224
if: ${{ github.event_name == 'push' && github.repository_owner == 'swiftly-solution' }}
225225
needs: [versioning, releasing]
@@ -236,5 +236,5 @@ jobs:
236236
- name: Publish to nuget
237237
run: |
238238
cd managed
239-
dotnet pack --include-symbols --output nupkgs -c Release -p:Version=${{ needs.versioning.outputs.fullSemVer }}
240-
dotnet nuget push nupkgs/SwiftlyS2.CS2.${{ needs.versioning.outputs.fullSemVer }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://nuget.org/api/v2/package
239+
dotnet pack --include-symbols --output nupkgs -c Release -p:Version=${{ needs.versioning.outputs.semVer }}
240+
dotnet nuget push nupkgs/SwiftlyS2.CS2.${{ needs.versioning.outputs.semVer }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://nuget.org/api/v2/package

0 commit comments

Comments
 (0)