Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
7e73240
Create betarelease.yml
maxijabase Dec 15, 2021
d18065b
initial structure modification
maxijabase Dec 15, 2021
bef3d60
Merge branch 'master' into development
maxijabase Dec 15, 2021
e838f7b
Merge branch 'master' into beta_version
maxijabase Dec 15, 2021
62370bc
Merge branch 'development' into beta_version
maxijabase Dec 15, 2021
c3e0c62
Update betarelease.yml
maxijabase Dec 15, 2021
a3df127
fix prebuild bug
maxijabase Dec 15, 2021
df841b2
made postbuild file
maxijabase Dec 15, 2021
95a8fed
Update betarelease.yml
maxijabase Dec 15, 2021
9d7fe2e
fix portable version location
maxijabase Dec 15, 2021
f60798a
Merge branch 'development' of https://github.com/maxijabase/SPCode in…
maxijabase Dec 15, 2021
552f43c
remove portable zip as resource
maxijabase Dec 15, 2021
7086f92
Revert "remove portable zip as resource"
maxijabase Dec 15, 2021
f25e448
Update betarelease.yml
maxijabase Dec 15, 2021
4c7ba69
Update betarelease.yml
maxijabase Dec 15, 2021
91d70bf
Merge branch 'development' of https://github.com/maxijabase/SPCode in…
maxijabase Dec 15, 2021
2c4faa7
Update betarelease.yml
maxijabase Dec 18, 2021
4009e60
Update betarelease.yml
maxijabase Dec 19, 2021
d45dd58
Update betarelease.yml
maxijabase Dec 19, 2021
6fec204
Update betarelease.yml
maxijabase Dec 19, 2021
6410183
Merge branch 'SPCodeOrg:master' into master
maxijabase Dec 19, 2021
edc34cb
Delete compile.yaml
maxijabase Dec 20, 2021
19f9494
Update release.yml
maxijabase Dec 20, 2021
f24d800
Update betarelease.yml
maxijabase Dec 20, 2021
93419cd
Update betarelease.yml
maxijabase Dec 20, 2021
1e5f1ef
Update betarelease.yml
maxijabase Dec 20, 2021
03b0fa2
Update betarelease.yml
maxijabase Dec 20, 2021
b7bbc20
Update betarelease.yml
maxijabase Dec 20, 2021
7a9172f
Update betarelease.yml
maxijabase Dec 20, 2021
6289719
Update betarelease.yml
maxijabase Dec 20, 2021
98e56d6
Update prebuild.bat
maxijabase Dec 20, 2021
87c9eff
Update betarelease.yml
maxijabase Dec 20, 2021
5514741
Update betarelease.yml
maxijabase Dec 20, 2021
3d6a5a6
Update betarelease.yml
maxijabase Dec 20, 2021
81c96ee
Update betarelease.yml
maxijabase Dec 20, 2021
5a20eac
Update betarelease.yml
maxijabase Dec 20, 2021
077935b
Update betarelease.yml
maxijabase Dec 20, 2021
53d0f2f
Update betarelease.yml
maxijabase Dec 20, 2021
61d72ab
Update betarelease.yml
maxijabase Dec 20, 2021
519796c
Update betarelease.yml
maxijabase Dec 20, 2021
6cbb2a5
Update betarelease.yml
maxijabase Dec 21, 2021
2d280a5
Update release.yml
maxijabase Dec 21, 2021
f4c9c55
Merge branch 'development'
maxijabase Dec 21, 2021
f6d3932
change 1
maxijabase Dec 21, 2021
f19be93
change 2
maxijabase Dec 21, 2021
3354bc5
change 3
maxijabase Dec 21, 2021
faeea52
Merge branch 'development'
maxijabase Dec 21, 2021
42bce37
Update release.yml
maxijabase Dec 21, 2021
8c98aff
added 1
maxijabase Dec 21, 2021
f8fc87e
added 2
maxijabase Dec 21, 2021
7c70bc6
added 3
maxijabase Dec 21, 2021
6262ade
added 4
maxijabase Dec 21, 2021
708f1ae
change 5
maxijabase Dec 21, 2021
bcd335d
modified updater to work with beta version
maxijabase Dec 22, 2021
1ba3c86
Update UpdateCheck.cs
maxijabase Dec 22, 2021
1c819c3
rearranged files and icons to work with the different versions
maxijabase Dec 23, 2021
5e8e672
fixed updater resource dependencies
maxijabase Dec 23, 2021
52e6678
fixed route in prebuild
maxijabase Dec 23, 2021
a6f34f6
fix some more things
maxijabase Dec 23, 2021
f3b36b0
re-enable updater in betarelease.yml
maxijabase Dec 23, 2021
e5cb521
fix betarelease.yml indentation
maxijabase Dec 23, 2021
6b183b1
fix betarelease.yml indentation
maxijabase Dec 23, 2021
2066564
Update betarelease.yml
maxijabase Dec 23, 2021
005ae61
more fixes
maxijabase Dec 24, 2021
393825e
Update betarelease.yml
maxijabase Dec 24, 2021
ea7228a
Merge branch 'ongoing' into development
maxijabase Dec 24, 2021
e06b98c
fix portable beta executable name
maxijabase Dec 24, 2021
42f75e6
Merge branch 'development' into ongoing
maxijabase Dec 24, 2021
69ad4f1
a
maxijabase Dec 24, 2021
ad3da57
a
maxijabase Dec 24, 2021
ba061bc
Merge branch 'development' into ongoing
maxijabase Dec 24, 2021
6f2a8f8
fix wrong beta detection
maxijabase Dec 24, 2021
039c970
revert assembly name change
maxijabase Dec 24, 2021
aec5813
fix portable
maxijabase Dec 24, 2021
6fb44df
more improvements
maxijabase Dec 24, 2021
0ae6f5b
change 1
maxijabase Dec 24, 2021
2662f6b
change 2
maxijabase Dec 24, 2021
3d1f823
fix updater
maxijabase Dec 24, 2021
27a4bab
test change
maxijabase Dec 24, 2021
9886331
test change
maxijabase Dec 24, 2021
98b1bba
Merge branch 'ongoing' into development
maxijabase Dec 24, 2021
ba3b990
test
maxijabase Dec 24, 2021
61b9cf9
fix stable portable
maxijabase Dec 24, 2021
d8a9fc9
polish last details
maxijabase Dec 24, 2021
5aac974
fix updater overwriting sourcepawn folder contents
maxijabase Dec 25, 2021
c53e9cb
agilize updater by reopening spcode with a success message
maxijabase Dec 26, 2021
2365167
improved updater exception handling visuals
maxijabase Dec 26, 2021
d08f8e6
add update failed message to spcode
maxijabase Dec 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 111 additions & 0 deletions .github/workflows/betarelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: Publish Beta Release

on:
push:
branches:
- development

jobs:

# Build and release
build:

runs-on: windows-latest
steps:

# Checkout the repository
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

# Fetch latest tag and rev number
- name: Get tag and rev number
id: get-tag-rev
run: |
echo "::set-output name=TAG::$(git describe --match "[0-9].[0-9].[0-9].[0-9]" --tags --abbrev=0)"
echo "::set-output name=REV::$(git rev-list HEAD --count)"

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100

# Nuget
- name: Restore NuGet packages
uses: nuget/setup-nuget@v1
with:
nuget-version: '5.x'
- run: nuget restore Spcode.sln

# Setup MSBuild
- name: Setup MSBuild
uses: microsoft/[email protected]

# Build SPCode
- name: Build SPCode
run: msbuild Spcode.csproj /p:Configuration=Release-Beta /p:langversion=latest

# Build Installer
- name: Build Installer (NSIS)
uses: joncloud/makensis-action@v1
with:
script-file: .\bin\Release-Beta\SPCode.nsi

# Compress Beta Portable Version
- name: Compress Portable Version
run: .\bin\Release-Beta\Compress.ps1
shell: powershell

# Build Updater
- name: Build Updater
run: msbuild Deploy\SPCodeUpdater\SPCodeUpdater.csproj /p:Configuration=Release-Beta /p:langversion=latest

# Create Release
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.get-tag-rev.outputs.TAG }}.beta${{ steps.get-tag-rev.outputs.REV }}
release_name: Release ${{ steps.get-tag-rev.outputs.TAG }}.beta${{ steps.get-tag-rev.outputs.REV }}
draft: false
prerelease: true

# Upload Installer
- name: Upload Installer
id: upload-installer
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\bin\Release-Beta\SPCode.Beta.Installer.exe
asset_name: SPCode.Beta.Installer.exe
asset_content_type: application/octet-stream

# Upload Portable
- name: Upload Portable
id: upload-portable
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\bin\Release-Beta\SPCode.Beta.Portable.zip
asset_name: SPCode.Beta.Portable.zip
asset_content_type: application/zip

# Upload Updater
- name: Upload Updater
id: upload-updater
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\Deploy\SpcodeUpdater\bin\Release-Beta\SPCodeUpdater.exe
asset_name: SPCodeUpdater.exe
asset_content_type: application/octet-stream
64 changes: 0 additions & 64 deletions .github/workflows/compile.yaml

This file was deleted.

36 changes: 24 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,38 @@ name: Publish Release

on:
push:
tags:
- '*'
branches:
- master

jobs:

# Build and release
build:

runs-on: windows-latest

steps:

# Checkout the repository
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

# Fetch latest tag
- name: Get tag
id: get-tag
run: |
echo "::set-output name=TAG::$(git describe --match "[0-9].[0-9].[0-9].[0-9]" --tags --abbrev=0)"

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100-rc.2.21505.57
dotnet-version: 6.0.100

# Nuget
- uses: nuget/setup-nuget@v1
- name: Restore NuGet packages
uses: nuget/setup-nuget@v1
with:
nuget-version: '5.x'
- run: nuget restore Spcode.sln
Expand All @@ -30,8 +42,8 @@ jobs:
- name: Setup MSBuild.exe
uses: microsoft/[email protected]

# Build Spcode
- name: Build Spcode
# Build SPCode
- name: Build SPCode
run: msbuild Spcode.csproj /p:Configuration=Release /p:langversion=latest

# Build Installer
Expand All @@ -55,8 +67,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
tag_name: ${{ steps.get-tag.outputs.TAG }}
release_name: Release ${{ steps.get-tag.outputs.TAG }}
draft: false
prerelease: false

Expand All @@ -67,7 +79,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\bin\Release\SPCode.Installer.exe
asset_name: SPCode.Installer.exe
asset_content_type: application/octet-stream
Expand All @@ -78,7 +90,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\bin\Release\SPCode.Portable.zip
asset_name: SPCode.Portable.zip
asset_content_type: application/zip
Expand All @@ -89,7 +101,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: .\Deploy\SpcodeUpdater\bin\Release\SPCodeUpdater.exe
asset_name: SPCodeUpdater.exe
asset_content_type: application/octet-stream
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,6 @@ $RECYCLE.BIN/
# IDE FIles
/.idea/
*.iml
App/AssemblyInfo.cs
Resources/Icons/Icon.ico
Resources/Icons/icon256x.png
33 changes: 0 additions & 33 deletions App/AssemblyInfo.cs

This file was deleted.

18 changes: 18 additions & 0 deletions Deploy/AssemblyInfo_Template.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("${PROGRAMNAME}")]
[assembly: AssemblyDescription("SPCode - A lightweight SourcePawn editor")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("SPCode Organization")]
[assembly: AssemblyProduct("${PROGRAMNAME}")]
[assembly: AssemblyCopyright("Copyright © Julien Kluge 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: ComVisible(false)]
[assembly: Guid("11db2f22-8d7c-4a10-a940-b103e4e3bdf2")]

[assembly: AssemblyVersion("${TAG}")]
[assembly: AssemblyInformationalVersion("${TAG}.beta${REV}")]
32 changes: 0 additions & 32 deletions Deploy/Compress.ps1

This file was deleted.

15 changes: 15 additions & 0 deletions Deploy/Compress_Beta.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$loc = Get-Location
Set-Location 'bin\Release-Beta\'
$compress = @{
LiteralPath=
"sourcepawn/",
"lysis/",
"SPCode.exe",
"lang_0_spcode.xml",
"GPLv3.txt",
"License.txt"
DestinationPath = "SPCode.Beta.Portable.zip"

}
Compress-Archive -Force @compress
Set-Location $loc
15 changes: 15 additions & 0 deletions Deploy/Compress_Stable.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$loc = Get-Location
Set-Location 'bin\Release\'
$compress = @{
LiteralPath=
"sourcepawn/",
"lysis/",
"SPCode.exe",
"lang_0_spcode.xml",
"GPLv3.txt",
"License.txt"
DestinationPath = "SPCode.Portable.zip"

}
Compress-Archive -Force @compress
Set-Location $loc
Loading