Skip to content

Commit

Permalink
fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
parvit committed Sep 16, 2024
1 parent d049503 commit a73417c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ run-name: Code Integration [${{ github.event_name }}][${{ github.head_ref || git

jobs:
docs:
if: true
if: false
runs-on: ubuntu-latest
defaults:
run:
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
done
build-windows:
if: true
if: false
runs-on: windows-latest
env:
GO_VERSION: 1.20.14
Expand Down
2 changes: 1 addition & 1 deletion service/service_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"syscall"
"time"

"github.com/Project-Faster/qpep/logger"
"github.com/Project-Faster/qpep/shared/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion shared/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package shared

import (
"github.com/parvit/qpep/shared/logger"
"github.com/Project-Faster/qpep/shared/logger"
"os/exec"
"strings"
"syscall"
Expand Down
4 changes: 2 additions & 2 deletions workers/gateway/gateway_interface_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package gateway

import (
"fmt"
"github.com/Project-Faster/qpep/shared"
"github.com/Project-Faster/qpep/shared/logger"
"github.com/jackpal/gateway"
"github.com/parvit/qpep/shared"
"github.com/parvit/qpep/shared/logger"
"net"
"net/url"
)
Expand Down
2 changes: 1 addition & 1 deletion workers/gateway/gateway_interface_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"errors"
"fmt"
"github.com/Project-Faster/monkey"
stderr "github.com/parvit/qpep/shared/errors"
stderr "github.com/Project-Faster/qpep/shared/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"net/url"
Expand Down

0 comments on commit a73417c

Please sign in to comment.