Skip to content

Commit

Permalink
merge hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
tmm360 committed Nov 13, 2023
2 parents 08b65ad + 1e56264 commit a6e5043
Show file tree
Hide file tree
Showing 99 changed files with 443 additions and 442 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/stable-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: etherna/beehive-manager
tags: |
Expand All @@ -26,7 +26,7 @@ jobs:
type=semver,pattern=v{{version}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
Expand All @@ -35,7 +35,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/unstable-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: etherna/beehive-manager
tags: |
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: etherna/beehive-manager
tags: |
type=ref,event=branch

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
13 changes: 13 additions & 0 deletions .idea/.idea.BeehiveManager/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.idea.BeehiveManager/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/.idea.BeehiveManager/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.BeehiveManager/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.BeehiveManager/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion BeehiveManager.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.dockerignore = .dockerignore
.editorconfig = .editorconfig
.gitignore = .gitignore
BeehiveManager.sln.licenseheader = BeehiveManager.sln.licenseheader
Dockerfile = Dockerfile
LICENSE = LICENSE
nuget.config = nuget.config
Expand Down Expand Up @@ -41,6 +40,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CE10A1ED-2
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeehiveManager.Persistence.Tests", "test\BeehiveManager.Persistence.Tests\BeehiveManager.Persistence.Tests.csproj", "{74F4D982-085D-42F4-9E61-C288B25E64CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9EEC390E-0D81-4379-A02A-C1A7B55CF431}"
ProjectSection(SolutionItems) = preProject
.github\workflows\stable-release.yml = .github\workflows\stable-release.yml
.github\workflows\unstable-release.yml = .github\workflows\unstable-release.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -80,6 +85,7 @@ Global
{74960F98-A78D-40A5-8CD1-20E05DB4DD35} = {11FCB662-8945-484F-9459-C2C5823045E7}
{791D69C2-725F-4E7A-B2F9-30CDC151A0C5} = {2100F089-0589-448E-93E0-45B069DDCE64}
{74F4D982-085D-42F4-9E61-C288B25E64CB} = {CE10A1ED-2695-44EC-97F1-CB91FC5412D8}
{9EEC390E-0D81-4379-A02A-C1A7B55CF431} = {61C3814F-A839-44D7-8335-0F365D3FFA8C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {67056C24-38A7-45E5-A31A-0CF654008257}
Expand Down
14 changes: 14 additions & 0 deletions BeehiveManager.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> Copyright 2021-present Etherna SA

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</s:String></wpf:ResourceDictionary>
47 changes: 0 additions & 47 deletions BeehiveManager.sln.licenseheader

This file was deleted.

2 changes: 1 addition & 1 deletion src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
<PackageReference Include="MongODM.Core" Version="0.24.0-alpha.81" />
<PackageReference Include="MongODM.Core" Version="0.24.0-alpha.101" />
<PackageReference Include="Nethereum.Web3" Version="4.14.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Domain/IBeehiveDbContext.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Domain/Models/BeeNode.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Domain/Models/EntityModelBase.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Domain/Models/ModelBase.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Persistence/BeehiveDbContext.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2021-present Etherna Sagl
//
// Copyright 2021-present Etherna SA
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
Loading

0 comments on commit a6e5043

Please sign in to comment.