Skip to content

Commit 1fa8ca1

Browse files
FlaminelFlaminel
committed
fixed test
1 parent 0b729bd commit 1fa8ca1

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

‎.github/workflows/build_executable.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ jobs:
8787
cp -r code/frontend/dist/ui/browser/* code/backend/${{ env.executableName }}/wwwroot/
8888
8989
- name: Build win-x64
90-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-win-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
90+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
9191

9292
- name: Build linux-x64
93-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-linux-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
93+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
9494

9595
- name: Build linux-arm64
96-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-linux-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
96+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
9797

9898
- name: Build osx-x64
99-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-osx-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
99+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
100100

101101
- name: Build osx-arm64
102-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-osx-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
102+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
103103

104104
- name: Create sample configuration files
105105
run: |
@@ -117,36 +117,36 @@ jobs:
117117
EOF
118118
119119
# Copy to each build directory
120-
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-win-amd64/appsettings.json
121-
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-linux-amd64/appsettings.json
122-
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-linux-arm64/appsettings.json
123-
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-osx-amd64/appsettings.json
124-
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-osx-arm64/appsettings.json
120+
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64/appsettings.json
121+
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64/appsettings.json
122+
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64/appsettings.json
123+
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64/appsettings.json
124+
cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64/appsettings.json
125125
126126
- name: Zip win-x64
127127
run: |
128128
cd ./artifacts
129-
zip -r ./${{ env.githubRepositoryName }}-win-amd64.zip ./${{ env.githubRepositoryName }}-win-amd64/
129+
zip -r ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64.zip ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64/
130130
131131
- name: Zip linux-x64
132132
run: |
133133
cd ./artifacts
134-
zip -r ./${{ env.githubRepositoryName }}-linux-amd64.zip ./${{ env.githubRepositoryName }}-linux-amd64/
134+
zip -r ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64.zip ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64/
135135
136136
- name: Zip linux-arm64
137137
run: |
138138
cd ./artifacts
139-
zip -r ./${{ env.githubRepositoryName }}-linux-arm64.zip ./${{ env.githubRepositoryName }}-linux-arm64/
139+
zip -r ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64.zip ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64/
140140
141141
- name: Zip osx-x64
142142
run: |
143143
cd ./artifacts
144-
zip -r ./${{ env.githubRepositoryName }}-osx-amd64.zip ./${{ env.githubRepositoryName }}-osx-amd64/
144+
zip -r ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64.zip ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64/
145145
146146
- name: Zip osx-arm64
147147
run: |
148148
cd ./artifacts
149-
zip -r ./${{ env.githubRepositoryName }}-osx-arm64.zip ./${{ env.githubRepositoryName }}-osx-arm64/
149+
zip -r ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64.zip ./${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64/
150150
151151
- name: Upload artifacts
152152
uses: actions/upload-artifact@v4
@@ -170,8 +170,8 @@ jobs:
170170
target_commitish: main
171171
generate_release_notes: true
172172
files: |
173-
./artifacts/${{ env.githubRepositoryName }}-win-amd64.zip
174-
./artifacts/${{ env.githubRepositoryName }}-linux-amd64.zip
175-
./artifacts/${{ env.githubRepositoryName }}-linux-arm64.zip
176-
./artifacts/${{ env.githubRepositoryName }}-osx-amd64.zip
177-
./artifacts/${{ env.githubRepositoryName }}-osx-arm64.zip
173+
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64.zip
174+
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64.zip
175+
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64.zip
176+
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64.zip
177+
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64.zip

‎code/backend/Cleanuparr.Shared/Helpers/BasePathValidator.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ public static ValidationResult Validate(string? basePath)
2626
// Trim whitespace
2727
basePath = basePath.Trim();
2828

29-
// Check for just root path
30-
if (basePath == "/")
31-
{
32-
return ValidationResult.Failure("BASE_PATH cannot be just '/' (conflicts with root)");
33-
}
34-
3529
// Check length
3630
if (basePath.Length > MaxLength)
3731
{

0 commit comments

Comments
 (0)