Merge pull request #4 from marat2509/master

feat(release): v2.1.0
maksimkurb · Dec 22, 2024 · cd81aed · cd81aed
2 parents d7d0c26 + 40c005e
commit cd81aed
Show file tree

Hide file tree

Showing 12 changed files with 249 additions and 105 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,58 @@
+name: Create and publish a Docker images
+
+on:
+  push:
+  workflow_dispatch:
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  REGISTRY: ghcr.io
+  REGISTRY_USERNAME: ${{ github.actor }}
+  REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+  PLATFORMS: linux/amd64
+
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5.5.1
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
+          tags: |            
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=sha,prefix={{branch}}-,enable=${{ startsWith(github.ref, 'refs/heads/') }}
+            type=ref,event=branch
+            type=ref,event=tag,enable=${{ startsWith(github.ref, 'refs/tags/') }}
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: .
+          provenance: false
+          platforms: ${{ env.PLATFORMS }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -15,10 +15,5 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.0.100
-
-    - name: Build with dotnet
-      run: dotnet build --configuration Release
+    - name: Build with docker
+      run: docker image build .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,9 +17,9 @@ jobs:
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 3.0.100
+          dotnet-version: 3.0
 
       - name: Build with dotnet (linux-x64)
         run: dotnet publish -c "Release" -r linux-x64 --self-contained true BridgeBotNext

diff --git a/BridgeBotNext/BotOrchestrator.cs b/BridgeBotNext/BotOrchestrator.cs
@@ -160,10 +160,10 @@ await e.Message.OriginConversation.SendMessage(
 3) Введите полученную команду в другой беседе, где находится этот бот.
 Вы можете посмотреть текущие соединения с помощью команды /list
 
-/Поддерживаемые_мессенджеры: {string.Join(", ", _providers.Select(p => p.DisplayName))}
-/Версия_бота: {Program.Version}
-/Страница_проекта: https://github.com/maksimkurb/BridgeBotNext
-/Автор: <Maxim Kurbatov> max@cubly.ru, 2018-2020");
+- Поддерживаемые мессенджеры: {string.Join(", ", _providers.Select(p => p.DisplayName))}
+- Версия бота: {Program.Version}
+- Страница проекта: https://github.com/maksimkurb/BridgeBotNext
+- Автор: <Maxim Kurbatov> max@cubly.ru, 2018-2024");
         }
 
         private async Task OnDisconnectCommand(Provider.MessageEventArgs e, string command, string args)

diff --git a/BridgeBotNext/BridgeBotNext.csproj b/BridgeBotNext/BridgeBotNext.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="SkiaSharp" Version="2.80.1" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.1" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-    <PackageReference Include="Telegram.Bot" Version="15.7.1" />
+    <PackageReference Include="Telegram.Bot" Version="16.0.0" />
     <PackageReference Include="VkNet" Version="1.53.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/BridgeBotNext/Program.cs b/BridgeBotNext/Program.cs
@@ -17,7 +17,7 @@ namespace BridgeBotNext
 {
     internal class Program
     {
-        public static string Version => "2.0.0";
+        public static string Version => "2.1.0";
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args)
         {