Compare commits
25 Commits
1.2.7471.8
...
master
Author | SHA1 | Date |
---|---|---|
J. Fronny | d327bfb93f | |
J. Fronny | 85bed21599 | |
J. Fronny | a1e08a2273 | |
J. Fronny | 8ac79b9fb5 | |
Renovate Bot | dc337d8b4e | |
J. Fronny | 17311cf3e4 | |
J. Fronny | 9f9ce976a9 | |
J. Fronny | 6c8e8c2057 | |
J. Fronny | ce9ae20a7a | |
JFronny | f2b827eac3 | |
J. Fronny | 2431338d84 | |
J. Fronny | 5471318c48 | |
J. Fronny | 08679ef881 | |
J. Fronny | 3b660ab4a6 | |
J. Fronny | 59ff9d309c | |
J. Fronny | 9077622b7b | |
J. Fronny | ab4d83733a | |
J. Fronny | be220a4610 | |
J. Fronny | 123c5994a2 | |
J. Fronny | b568eb1877 | |
J. Fronny | 94bd2685b6 | |
J. Fronny | edcec38f62 | |
J. Fronny | 0e53527aa3 | |
J. Fronny | 3475274a92 | |
J. Fronny | 03e7ea4829 |
|
@ -1,75 +0,0 @@
|
|||
name: CD
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Build
|
||||
id: base_init
|
||||
run: |
|
||||
choco install ffmpeg
|
||||
python DownloadDataDepsInstall.py
|
||||
python DownloadData.py
|
||||
$(new-object System.Net.WebClient).DownloadFile("https://www.github.com/JFronny/UpTool2/releases/latest/download/Tools.zip", "$($(pwd).Path)\Tools.zip")
|
||||
& "C:\Program Files\7-Zip\7z.exe" x .\Tools.zip
|
||||
rm Tools.zip
|
||||
rm Install.bat
|
||||
rm Remove.bat
|
||||
dotnet build --verbosity:m -p:Configuration=Release
|
||||
cp *\bin\Release\netcoreapp3.1\package.zip .
|
||||
$file = Get-Item $(Resolve-Path *\bin\Release\netcoreapp3.1\*.exe).Path
|
||||
$asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
|
||||
$asmver = $asm.GetName().Version.ToString()
|
||||
echo "::set-output name=vers::$asmver"
|
||||
- name: Create Release
|
||||
id: create_release
|
||||
uses: actions/create-release@v1.0.1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ steps.base_init.outputs.vers }}
|
||||
release_name: Release ${{ steps.base_init.outputs.vers }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
- name: Upload Release Asset
|
||||
id: upload_release_asset
|
||||
uses: actions/upload-release-asset@v1.0.2
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./package.zip
|
||||
asset_name: package.zip
|
||||
asset_content_type: application/zip
|
||||
- name: Generate XML
|
||||
run: |
|
||||
$file = Get-Item $(Resolve-Path *\bin\Release\netcoreapp3.1\*.exe).Path
|
||||
$asm = [Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll")
|
||||
[System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
|
||||
[System.XML.XMLElement]$app=$xml.CreateElement("app")
|
||||
$xml.appendChild($app)
|
||||
$app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
|
||||
$app.appendChild($xml.CreateElement("Description")).InnerText = "Terminal based Tetris clone"
|
||||
$app.appendChild($xml.CreateElement("Version")).InnerText = "${{ steps.base_init.outputs.vers }}"
|
||||
$app.appendChild($xml.CreateElement("ID")).InnerText = "9214aca9-af09-441d-8329-612e77347eba"
|
||||
$app.appendChild($xml.CreateElement("File")).InnerText = "${{ steps.upload_release_asset.outputs.browser_download_url }}"
|
||||
$app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
|
||||
$app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
|
||||
$app.appendChild($xml.CreateElement("Icon")).InnerText = "https://raw.githubusercontent.com/JFronny/testexetrisathlon/master/testexetrisathlon/tetris_yUxH6t_256px.ico"
|
||||
echo NULL > app.xml
|
||||
$xml.save($(gi .\app.xml).Fullname)
|
||||
- name: Upload XML
|
||||
uses: actions/upload-release-asset@v1.0.2
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./app.xml
|
||||
asset_name: app.xml
|
||||
asset_content_type: text/xml
|
|
@ -1,5 +1,5 @@
|
|||
#Soundtrack data
|
||||
testexetrisathlon/*.mp3
|
||||
#Soundtrack data (not enabled because GitLab uses arm64 for windows shared runners with which ffmpeg which is required to generate these files is not compatible)
|
||||
#testexetrisathlon/*.mp3
|
||||
|
||||
|
||||
# Created by https://www.gitignore.io/api/rider,csharp,visualstudio
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
.shared_windows_runners:
|
||||
tags:
|
||||
- windows
|
||||
|
||||
uptool:
|
||||
extends:
|
||||
- .shared_windows_runners
|
||||
stage: deploy
|
||||
script: |
|
||||
mkdir i
|
||||
cd i
|
||||
$(new-object System.Net.WebClient).DownloadFile("https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/Installer-generic.zip?job=uptool", "$($(pwd).Path)\Install.zip")
|
||||
& "C:\Program Files\7-Zip\7z.exe" x .\Install.zip
|
||||
.\Installer.exe --basic i -p
|
||||
cd ..
|
||||
rm -R i
|
||||
$Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Install"
|
||||
uptool --basic add-repo DevTools https://gitlab.com/JFronny/UpTool2/-/snippets/2010392/raw
|
||||
uptool --basic update
|
||||
uptool --basic install "UpTool2 package tools"
|
||||
$Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app"
|
||||
|
||||
#choco install youtube-dl ffmpeg -y --nocolor --no-progress
|
||||
#refreshenv
|
||||
#$env:Path=(
|
||||
# [System.Environment]::GetEnvironmentVariable("Path","Machine"),
|
||||
# [System.Environment]::GetEnvironmentVariable("Path","User")
|
||||
#) -match '.' -join ';'
|
||||
#My python script to auto-generate requirements would be here but arm64 sux
|
||||
mkdir .\build
|
||||
dotnet publish -o .\build -c Release
|
||||
$file = Get-Item $(Resolve-Path .\build\*.exe).Path
|
||||
pkgtool build --binDir build --mainBin $file --packageFile .\package.zip --noLogo
|
||||
$asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
|
||||
$asmver = $asm.GetName().Version.ToString()
|
||||
[System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
|
||||
[System.XML.XMLElement]$app=$xml.CreateElement("app")
|
||||
$xml.appendChild($app)
|
||||
$app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
|
||||
$app.appendChild($xml.CreateElement("Description")).InnerText = "Terminal based Tetris clone"
|
||||
$app.appendChild($xml.CreateElement("Version")).InnerText = $asmver
|
||||
$app.appendChild($xml.CreateElement("ID")).InnerText = "9214aca9-af09-441d-8329-612e77347eba"
|
||||
$app.appendChild($xml.CreateElement("File")).InnerText = $CI_PROJECT_URL + "/-/jobs/" + $CI_JOB_ID + "/artifacts/raw/package.zip"
|
||||
$app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
|
||||
$app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
|
||||
$app.appendChild($xml.CreateElement("Icon")).InnerText = "https://gitlab.com/JFronny/testexetrisathlon/-/raw/master/testexetrisathlon/tetris_yUxH6t_256px.ico"
|
||||
echo NULL > app.xml
|
||||
$xml.save($(gi .\app.xml).Fullname)
|
||||
artifacts:
|
||||
paths:
|
||||
- package.zip
|
||||
- app.xml
|
||||
only:
|
||||
- master
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RiderProjectSettingsUpdater">
|
||||
<option name="vcsConfiguration" value="1" />
|
||||
<option name="vcsConfiguration" value="2" />
|
||||
</component>
|
||||
</project>
|
|
@ -4,5 +4,5 @@ from subprocess import call
|
|||
|
||||
packages = [dist.project_name for dist in pkg_resources.working_set]
|
||||
if not "youtube-dl" in packages:
|
||||
packages += ["youtube-dl"]
|
||||
packages = ["youtube-dl"] + packages
|
||||
call("pip install --upgrade " + ' '.join(packages), shell=True)
|
|
@ -0,0 +1,21 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2020 J. Fronny
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
|
@ -1,5 +1,5 @@
|
|||
# testexetrisathlon
|
||||
[![UpTool2](https://img.shields.io/github/v/tag/JFronny/testexetrisathlon?color=informational&label=UpTool2)](https://jfronny.github.io/home/uptool)\
|
||||
[![UpTool2](https://img.shields.io/badge/Get%20it-on%20UpTool2-blue)](https://jfronny.gitlab.io/home/uptool)\
|
||||
To download the files required for building, just run `DownloadData.py`
|
||||
|
||||
If you don't have youtube-dl installed (or it is outdated), run `DownloadDataDepsInstall.py`
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"extends": [
|
||||
"config:base"
|
||||
]
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue