Skip to content

Commit

Permalink
Fix build issue (dagu-org#672)
Browse files Browse the repository at this point in the history
  • Loading branch information
yottahmd authored Aug 28, 2024
1 parent f1bfcdd commit 3c4f636
Show file tree
Hide file tree
Showing 151 changed files with 517 additions and 510 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ linters-settings:
goheader:
values:
const:
AUTHOR: The Daguflow/Dagu Authors
AUTHOR: The Dagu Authors
template: |-
Copyright (C) {{ YEAR }} {{ AUTHOR }}
Expand Down
8 changes: 4 additions & 4 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ changelog:
- "^docs:"
- "^test:"
brews:
# DEPRECATED: prefer using daguflow/dagu for brew formula
# DEPRECATED: prefer using dagu-org/dagu for brew formula
- repository:
owner: yohamta
name: homebrew-tap
directory: Formula
homepage: "https://github.com/daguflow/dagu"
homepage: "https://github.com/dagu-org/dagu"
description: "A No-code workflow executor that runs DAGs defined in a simple YAML format"
license: "GNU General Public License v3.0"
custom_block: |
Expand All @@ -46,10 +46,10 @@ brews:
working_dir var
end
- repository:
owner: daguflow
owner: dagu-org
name: homebrew-brew
directory: Formula
homepage: "https://github.com/daguflow/dagu"
homepage: "https://github.com/dagu-org/dagu"
description: "A No-code workflow executor that runs DAGs defined in a simple YAML format"
license: "GNU General Public License v3.0"
custom_block: |
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ ifeq ($(VERSION),)
$(error "VERSION is not set")
endif
echo "${COLOR_GREEN}Building the docker image with the version $(VERSION)...${COLOR_RESET}"
$(DOCKER_CMD) -t ghcr.io/daguflow/${APP_NAME}:$(VERSION) .
$(DOCKER_CMD) -t ghcr.io/dagu-org/${APP_NAME}:$(VERSION) .

# build-image-latest build the docker image with the latest tag and push to
# the registry.
build-image-latest:
@echo "${COLOR_GREEN}Building the docker image...${COLOR_RESET}"
$(DOCKER_CMD) -t ghcr.io/daguflow/${APP_NAME}:latest .
$(DOCKER_CMD) -t ghcr.io/dagu-org/${APP_NAME}:latest .

# gomerger merges all go files into a single file.
gomerger: ${LOCAL_DIR}/merged
Expand Down Expand Up @@ -189,7 +189,7 @@ addlicense:
-ignore "**/*.yaml" \
-ignore "**/filenotify/*" \
-ignore "**/testdata/**" \
-c "The Daguflow/Dagu Authors" \
-c "The Dagu Authors" \
-f scripts/header.txt \
.

Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
</p>

<p align="center">
<a href="https://goreportcard.com/report/github.com/daguflow/dagu">
<img src="https://goreportcard.com/badge/github.com/daguflow/dagu" />
<a href="https://goreportcard.com/report/github.com/dagu-org/dagu">
<img src="https://goreportcard.com/badge/github.com/dagu-org/dagu" />
</a>
<a href="https://codecov.io/gh/daguflow/dagu">
<img src="https://codecov.io/gh/daguflow/dagu/branch/main/graph/badge.svg?token=CODZQP61J2" />
<a href="https://codecov.io/gh/dagu-org/dagu">
<img src="https://codecov.io/gh/dagu-org/dagu/branch/main/graph/badge.svg?token=CODZQP61J2" />
</a>
<a href="https://github.com/daguflow/dagu/releases">
<img src="https://img.shields.io/github/release/daguflow/dagu.svg" />
<a href="https://github.com/dagu-org/dagu/releases">
<img src="https://img.shields.io/github/release/dagu-org/dagu.svg" />
</a>
<a href="https://godoc.org/github.com/daguflow/dagu">
<img src="https://godoc.org/github.com/daguflow/dagu?status.svg" />
<a href="https://godoc.org/github.com/dagu-org/dagu">
<img src="https://godoc.org/github.com/dagu-org/dagu?status.svg" />
</a>
<img src="https://github.com/daguflow/dagu/actions/workflows/ci.yaml/badge.svg" />
<img src="https://github.com/dagu-org/dagu/actions/workflows/ci.yaml/badge.svg" />
</p>

<div align="center">
Expand Down Expand Up @@ -151,23 +151,23 @@ You can install Dagu quickly using Homebrew or by downloading the latest binary
### Via Bash script

```sh
curl -L https://raw.githubusercontent.com/daguflow/dagu/main/scripts/installer.sh | bash
curl -L https://raw.githubusercontent.com/dagu-org/dagu/main/scripts/installer.sh | bash
```

### Via GitHub Releases Page

Download the latest binary from the [Releases page](https://github.com/daguflow/dagu/releases) and place it in your `$PATH` (e.g. `/usr/local/bin`).
Download the latest binary from the [Releases page](https://github.com/dagu-org/dagu/releases) and place it in your `$PATH` (e.g. `/usr/local/bin`).

### Via Homebrew (macOS)

```sh
brew install daguflow/brew/dagu
brew install dagu-org/brew/dagu
```

Upgrade to the latest version:

```sh
brew upgrade daguflow/brew/dagu
brew upgrade dagu-org/brew/dagu
```

### Via Docker
Expand All @@ -178,7 +178,7 @@ docker run \
-p 8080:8080 \
-v $HOME/.config/dagu/dags:/home/dagu/.config/dagu/dags \
-v $HOME/.local/share/dagu:/home/dagu/.local/share/dagu \
ghcr.io/daguflow/dagu:latest dagu start-all
ghcr.io/dagu-org/dagu:latest dagu start-all
```

See [Environment variables](https://dagu.readthedocs.io/en/latest/config.html#environment-variables) to configure those default directories.
Expand Down
14 changes: 7 additions & 7 deletions cmd/common_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -20,13 +20,13 @@ import (
"testing"
"time"

"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/dag"
"github.com/daguflow/dagu/internal/persistence"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/dag"
"github.com/dagu-org/dagu/internal/persistence"

"github.com/daguflow/dagu/internal/client"
"github.com/daguflow/dagu/internal/dag/scheduler"
"github.com/daguflow/dagu/internal/util"
"github.com/dagu-org/dagu/internal/client"
"github.com/dagu-org/dagu/internal/dag/scheduler"
"github.com/dagu-org/dagu/internal/util"
"github.com/spf13/cobra"
"github.com/stretchr/testify/require"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/dry.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -19,10 +19,10 @@ import (
"log"
"path/filepath"

"github.com/daguflow/dagu/internal/agent"
"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/dag"
"github.com/daguflow/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/agent"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/dag"
"github.com/dagu-org/dagu/internal/logger"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/dry_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -18,7 +18,7 @@ package cmd
import (
"testing"

"github.com/daguflow/dagu/internal/test"
"github.com/dagu-org/dagu/internal/test"
)

func TestDryCommand(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions cmd/modules.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -16,11 +16,11 @@
package cmd

import (
"github.com/daguflow/dagu/internal/client"
"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/logger"
"github.com/daguflow/dagu/internal/persistence"
dsclient "github.com/daguflow/dagu/internal/persistence/client"
"github.com/dagu-org/dagu/internal/client"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/persistence"
dsclient "github.com/dagu-org/dagu/internal/persistence/client"
)

func newClient(cfg *config.Config, ds persistence.DataStores, lg logger.Logger) client.Client {
Expand Down
2 changes: 1 addition & 1 deletion cmd/reqid.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand Down
14 changes: 7 additions & 7 deletions cmd/restart.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -20,12 +20,12 @@ import (
"path/filepath"
"time"

"github.com/daguflow/dagu/internal/agent"
"github.com/daguflow/dagu/internal/client"
"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/dag"
"github.com/daguflow/dagu/internal/dag/scheduler"
"github.com/daguflow/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/agent"
"github.com/dagu-org/dagu/internal/client"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/dag"
"github.com/dagu-org/dagu/internal/dag/scheduler"
"github.com/dagu-org/dagu/internal/logger"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/restart_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -19,10 +19,10 @@ import (
"testing"
"time"

"github.com/daguflow/dagu/internal/dag"
"github.com/daguflow/dagu/internal/dag/scheduler"
"github.com/daguflow/dagu/internal/logger"
"github.com/daguflow/dagu/internal/test"
"github.com/dagu-org/dagu/internal/dag"
"github.com/dagu-org/dagu/internal/dag/scheduler"
"github.com/dagu-org/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/test"
"github.com/stretchr/testify/require"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/retry.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -20,10 +20,10 @@ import (
"os"
"path/filepath"

"github.com/daguflow/dagu/internal/agent"
"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/dag"
"github.com/daguflow/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/agent"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/dag"
"github.com/dagu-org/dagu/internal/logger"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/retry_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -19,8 +19,8 @@ import (
"fmt"
"testing"

"github.com/daguflow/dagu/internal/dag/scheduler"
"github.com/daguflow/dagu/internal/test"
"github.com/dagu-org/dagu/internal/dag/scheduler"
"github.com/dagu-org/dagu/internal/test"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand Down
8 changes: 4 additions & 4 deletions cmd/scheduler.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -18,9 +18,9 @@ package cmd
import (
"log"

"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/logger"
"github.com/daguflow/dagu/internal/scheduler"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/scheduler"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/scheduler_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -19,7 +19,7 @@ import (
"testing"
"time"

"github.com/daguflow/dagu/internal/test"
"github.com/dagu-org/dagu/internal/test"
)

func TestSchedulerCommand(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/server.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -18,9 +18,9 @@ package cmd
import (
"log"

"github.com/daguflow/dagu/internal/config"
"github.com/daguflow/dagu/internal/frontend"
"github.com/daguflow/dagu/internal/logger"
"github.com/dagu-org/dagu/internal/config"
"github.com/dagu-org/dagu/internal/frontend"
"github.com/dagu-org/dagu/internal/logger"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/server_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -21,7 +21,7 @@ import (
"testing"
"time"

"github.com/daguflow/dagu/internal/test"
"github.com/dagu-org/dagu/internal/test"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/signal.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2024 The Daguflow/Dagu Authors
// Copyright (C) 2024 The Dagu Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit 3c4f636

Please sign in to comment.