Skip to content

Commit f138672

Browse files
authored
Merge branch 'feat/develop' into feat/container_management
2 parents 5f37c74 + 78c2bab commit f138672

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

.github/workflows/format.yaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
- 'api/**'
1313
- 'view/**'
1414

15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
1519
jobs:
1620
format-api:
1721
name: Format API
@@ -20,6 +24,7 @@ jobs:
2024
- uses: actions/checkout@v4
2125
with:
2226
ref: ${{ github.head_ref }}
27+
token: ${{ secrets.GITHUB_TOKEN }}
2328

2429
- uses: actions/setup-go@v5
2530
with:
@@ -30,15 +35,25 @@ jobs:
3035

3136
- name: Run gofmt
3237
working-directory: api
33-
run: gofmt -l -w .
38+
run: |
39+
echo "Running gofmt..."
40+
gofmt -l -w .
41+
git status
3442
3543
- name: Commit API changes
44+
id: api-commit
3645
if: github.event_name == 'pull_request'
3746
uses: stefanzweifel/git-auto-commit-action@v5
3847
with:
3948
commit_message: 'style(api): format Go code'
4049
branch: ${{ github.head_ref }}
4150
file_pattern: 'api/**/*.go'
51+
commit_user_name: 'github-actions[bot]'
52+
commit_user_email: 'github-actions[bot]@users.noreply.github.com'
53+
skip_dirty_check: false
54+
skip_fetch: true
55+
skip_checkout: true
56+
disable_globbing: false
4257

4358
format-view:
4459
name: Format View
@@ -47,6 +62,7 @@ jobs:
4762
- uses: actions/checkout@v4
4863
with:
4964
ref: ${{ github.head_ref }}
65+
token: ${{ secrets.GITHUB_TOKEN }}
5066

5167
- uses: actions/setup-node@v4
5268
with:
@@ -66,9 +82,16 @@ jobs:
6682
run: yarn format
6783

6884
- name: Commit View changes
85+
id: view-commit
6986
if: github.event_name == 'pull_request'
7087
uses: stefanzweifel/git-auto-commit-action@v5
7188
with:
7289
commit_message: 'style(view): format frontend code'
7390
branch: ${{ github.head_ref }}
74-
file_pattern: 'view/**/*.{js,jsx,ts,tsx,css,md,json}'
91+
file_pattern: 'view/**'
92+
commit_user_name: 'github-actions[bot]'
93+
commit_user_email: 'github-actions[bot]@users.noreply.github.com'
94+
skip_dirty_check: false
95+
skip_fetch: true
96+
skip_checkout: true
97+
disable_globbing: false

api/api/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"version": "v1",
55
"status": "active",
6-
"release_date": "2025-05-03T18:53:39.606295+05:30",
6+
"release_date": "2025-05-03T21:31:55.074534+05:30",
77
"end_of_life": "0001-01-01T00:00:00Z",
88
"changes": [
99
"Initial API version"

api/internal/features/domain/tests/update_domain_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ func TestUpdateDomain(t *testing.T) {
7474
assert.ErrorIs(t, err, domainTypes.ErrDomainNotFound)
7575
})
7676

77-
7877
t.Run("should update domain that belongs to server", func(t *testing.T) {
7978
setup := testutils.NewTestSetup()
8079
storage := &domainStorage.DomainStorage{DB: setup.DB, Ctx: setup.Ctx}

api/internal/features/user/controller/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"context"
55
"net/http"
66

7+
cache "github.com/raghavyuva/nixopus-api/internal/cache"
78
"github.com/raghavyuva/nixopus-api/internal/features/logger"
89
"github.com/raghavyuva/nixopus-api/internal/features/user/service"
910
"github.com/raghavyuva/nixopus-api/internal/features/user/storage"
1011
"github.com/raghavyuva/nixopus-api/internal/features/user/validation"
1112
shared_storage "github.com/raghavyuva/nixopus-api/internal/storage"
1213
"github.com/raghavyuva/nixopus-api/internal/utils"
13-
cache "github.com/raghavyuva/nixopus-api/internal/cache"
1414
)
1515

1616
type UserController struct {

api/internal/features/user/service/settings.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/raghavyuva/nixopus-api/internal/types"
88
)
99

10-
1110
func (s *UserService) GetSettings(userID string) (*types.UserSettings, error) {
1211
s.logger.Log(logger.Info, "getting user settings", "")
1312
return s.storage.GetUserSettings(userID)

0 commit comments

Comments
 (0)