Skip to content

Commit

Permalink
Restructure the content of the GitHub repository (#109)
Browse files Browse the repository at this point in the history
* Restructure directory to be more conform

* Fix it

* Fix docker build

* Forgot one
  • Loading branch information
Sella-GH authored Jul 6, 2024
1 parent a16d941 commit c8eb257
Show file tree
Hide file tree
Showing 215 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ updates:
open-pull-requests-limit: 25

- package-ecosystem: "nuget" # See documentation for possible values
directory: "/AzzyBot" # Location of package manifests
directory: "/src/AzzyBot" # Location of package manifests
schedule:
interval: "daily"
assignees:
Expand Down Expand Up @@ -90,7 +90,7 @@ updates:
open-pull-requests-limit: 25

- package-ecosystem: "nuget" # See documentation for possible values
directory: "/AzzyBot-Next" # Location of package manifests
directory: "/src/AzzyBot-Next" # Location of package manifests
schedule:
interval: "daily"
assignees:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Autobuild
uses: github/codeql-action/autobuild@v3
with:
working-directory: "/home/runner/work/AzzyBot/AzzyBot/AzzyBot-Next"
working-directory: "/home/runner/work/AzzyBot/AzzyBot/src/AzzyBot-Next"

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: kzrnm/get-net-sdk-project-versions-action@v2
id: get-version
with:
proj-path: AzzyBot-Next/AzzyBot-Next.csproj
proj-path: src/AzzyBot-Next/AzzyBot-Next.csproj

- name: Set version
id: set-version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dotnet-release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ jobs:
mkdir -p ./docker-zip/AzzyBot/Logs
mkdir -p ./docker-zip/AzzyBot/Modules/AzuraCast/Files
#mkdir -p ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/plugins
#mv ./AzzyBot/Modules/MusicStreaming/Files/application.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/application.yml
#mv ./AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml
#mv ./src/AzzyBot/Modules/MusicStreaming/Files/application.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/application.yml
#mv ./src/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml
#wget -qO ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/plugins/java-lyrics-plugin-1.6.4.jar https://maven.lavalink.dev/releases/me/duncte123/java-lyrics-plugin/1.6.4/java-lyrics-plugin-1.6.4.jar
mkdir -p ./docker-zip/AzzyBot/Settings
mv ./AzzyBot-Next/Settings/AzzyBotSettings-Docker.json ./docker-zip/AzzyBot/Settings/AzzyBotSettings-Docker.json
mv ./src/AzzyBot-Next/Settings/AzzyBotSettings-Docker.json ./docker-zip/AzzyBot/Settings/AzzyBotSettings-Docker.json
- name: Archive docker-zip artifact
uses: actions/upload-artifact@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Publish Debug
run: |
dotnet publish /home/runner/work/AzzyBot/AzzyBot/AzzyBot-Next/AzzyBot-Next.csproj -c Debug -r ${{ matrix.os }}-${{ matrix.arch }}
dotnet publish /home/runner/work/AzzyBot/AzzyBot/src/AzzyBot-Next/AzzyBot-Next.csproj -c Debug -r ${{ matrix.os }}-${{ matrix.arch }}
#- name: Download and extract Lavalink
# run: |
Expand Down Expand Up @@ -102,11 +102,11 @@ jobs:
mv ./SECURITY.md ./docker-zip/SECURITY.md
mkdir -p ./docker-zip/AzzyBot/Modules/AzuraCast/Files
#mkdir -p ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/plugins
#mv ./AzzyBot/Modules/MusicStreaming/Files/application.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/application.yml
#mv ./AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml
#mv ./src/AzzyBot/Modules/MusicStreaming/Files/application.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/application.yml
#mv ./src/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml
#wget -qO ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/plugins/java-lyrics-plugin-1.6.4.jar https://maven.lavalink.dev/releases/me/duncte123/java-lyrics-plugin/1.6.4/java-lyrics-plugin-1.6.4.jar
mkdir -p ./docker-zip/AzzyBot-Next/Settings
mv ./AzzyBot-Next/Settings/AzzyBotSettings.json ./docker-zip/AzzyBot-Next/Settings/AzzyBotSettings.json
mv ./src/AzzyBot-Next/Settings/AzzyBotSettings.json ./docker-zip/AzzyBot-Next/Settings/AzzyBotSettings.json
- name: Archive docker-zip artifact
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: kzrnm/get-net-sdk-project-versions-action@v2
id: get-version
with:
proj-path: AzzyBot-Next/AzzyBot-Next.csproj
proj-path: src/AzzyBot-Next/AzzyBot-Next.csproj

- name: Compare tags
id: compare
Expand Down
4 changes: 2 additions & 2 deletions AzzyBot.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34202.233
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot", "AzzyBot\AzzyBot.csproj", "{91AAAF0E-4931-4247-BE86-74C595C7D5FC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot", "src\AzzyBot\AzzyBot.csproj", "{91AAAF0E-4931-4247-BE86-74C595C7D5FC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot-Next", "AzzyBot-Next\AzzyBot-Next.csproj", "{6B05D8A4-AC04-4EA3-B625-C69DFE68761E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot-Next", "src\AzzyBot-Next\AzzyBot-Next.csproj", "{6B05D8A4-AC04-4EA3-B625-C69DFE68761E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
USER root
RUN apt update && apt upgrade -y && apt autoremove -y
WORKDIR /src
COPY ./AzzyBot-Next ./
WORKDIR /build
COPY ./src/AzzyBot-Next ./
RUN dotnet restore ./AzzyBot-Next.csproj
ARG ARCH
ARG CONFIG
Expand All @@ -20,7 +20,7 @@ RUN apt install -y --no-install-recommends iputils-ping

# Copy the built app
WORKDIR /app
COPY --from=build /src/out .
COPY --from=build /build/out .

# Add commit, timestamp and lines of code
ARG COMMIT
Expand Down
6 changes: 3 additions & 3 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
USER root
RUN apt update && apt upgrade -y && apt autoremove -y
WORKDIR /src
COPY ./AzzyBot-Next ./
WORKDIR /build
COPY ./src/AzzyBot-Next ./
RUN dotnet restore ./AzzyBot-Next.csproj
ARG ARCH
ARG CONFIG
Expand All @@ -20,7 +20,7 @@ RUN apt install -y --no-install-recommends iputils-ping

# Copy the built app
WORKDIR /app
COPY --from=build /src/out .
COPY --from=build /build/out .

# Add commit, timestamp and lines of code
ARG COMMIT
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit c8eb257

Please sign in to comment.