Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63e6212a0b | ||
|
|
cbd899ff8c | ||
|
|
c9ac3235db | ||
|
|
4dc9a6e846 | ||
|
|
662db7cd9d | ||
|
|
57072010dc | ||
|
|
ab8db644cb | ||
|
|
1d3a218e2d | ||
|
|
080a417eff | ||
|
|
4e1fa43e8e | ||
|
|
eed0ca1865 | ||
|
|
2e7b1d2531 | ||
|
|
cd0fb03605 | ||
|
|
cc8fff4e3d | ||
|
|
3e98bd145a |
@@ -21,17 +21,18 @@ jobs:
|
|||||||
id: get_version
|
id: get_version
|
||||||
uses: battila7/get-version-action@v2.0.0
|
uses: battila7/get-version-action@v2.0.0
|
||||||
|
|
||||||
- name: Setup Golang 1.13
|
- name: Setup Golang 1.15
|
||||||
uses: actions/setup-go@v1
|
uses: actions/setup-go@v1
|
||||||
with:
|
with:
|
||||||
go-version: 1.13
|
go-version: 1.15
|
||||||
|
|
||||||
- name: Install go-bindata and build migrations
|
- name: Install go-bindata and build migrations
|
||||||
|
env:
|
||||||
|
GOPATH: /home/runner/work/Geeksbot/
|
||||||
run: |
|
run: |
|
||||||
pwd
|
|
||||||
echo $(GOPATH)
|
|
||||||
go get -u github.com/go-bindata/go-bindata/...
|
go get -u github.com/go-bindata/go-bindata/...
|
||||||
go-bindata -pkg migrations -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
|
/home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
|
||||||
|
head $GITHUB_WORKSPACE/internal/database/migrations/bindata.go
|
||||||
|
|
||||||
- name: Build container image
|
- name: Build container image
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ RUN go mod download
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN go install github.com/dustinpianalto/geeksbot/...
|
RUN go install github.com/dustinpianalto/geeksbot/...
|
||||||
|
RUN go get -u github.com/go-bindata/go-bindata/...
|
||||||
|
|
||||||
CMD [ "go", "run", "cmd/geeksbot/main.go"]
|
CMD [ "go", "run", "cmd/geeksbot/main.go"]
|
||||||
|
|
||||||
@@ -16,5 +17,6 @@ from alpine
|
|||||||
WORKDIR /bin
|
WORKDIR /bin
|
||||||
|
|
||||||
COPY --from=dev /go/bin/geeksbot ./geeksbot
|
COPY --from=dev /go/bin/geeksbot ./geeksbot
|
||||||
|
COPY --from=dev /go/bin/go-bindata ./go-bindata
|
||||||
|
|
||||||
CMD [ "geeksbot" ]
|
CMD [ "geeksbot" ]
|
||||||
|
|||||||
@@ -30,15 +30,19 @@ func ConnectDatabase(dbConnString string) {
|
|||||||
db.SetConnMaxLifetime(300)
|
db.SetConnMaxLifetime(300)
|
||||||
d, err := bindata.WithInstance(s)
|
d, err := bindata.WithInstance(s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(fmt.Errorf("Cannot load migrations: %w", err))
|
log.Fatal(fmt.Errorf("cannot load migrations: %w", err))
|
||||||
}
|
}
|
||||||
instance, err := postgres.WithInstance(db, &postgres.Config{})
|
instance, err := postgres.WithInstance(db, &postgres.Config{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(fmt.Errorf("Cannot create db driver: %w", err))
|
log.Fatal(fmt.Errorf("cannot create db driver: %w", err))
|
||||||
}
|
}
|
||||||
m, err := migrate.NewWithInstance("go-bindata", d, "postgres", instance)
|
m, err := migrate.NewWithInstance("go-bindatafoo", d, "postgres", instance)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(fmt.Errorf("Cannot create migration instance: %w", err))
|
log.Fatal(fmt.Errorf("cannot create migration instance: %w", err))
|
||||||
}
|
}
|
||||||
m.Up()
|
err = m.Up()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
log.Println("Migrations Run")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ BEGIN;
|
|||||||
prefixes varchar(10)[],
|
prefixes varchar(10)[],
|
||||||
PRIMARY KEY(id)
|
PRIMARY KEY(id)
|
||||||
);
|
);
|
||||||
CREATE TYPE IF NOT EXISTS role_type as ENUM (
|
CREATE TYPE role_type as ENUM (
|
||||||
'normal',
|
'normal',
|
||||||
'moderator',
|
'moderator',
|
||||||
'admin',
|
'admin',
|
||||||
@@ -25,7 +25,7 @@ BEGIN;
|
|||||||
id varchar(30),
|
id varchar(30),
|
||||||
guild_id varchar(30),
|
guild_id varchar(30),
|
||||||
admin boolean,
|
admin boolean,
|
||||||
default boolean,
|
default_channel boolean,
|
||||||
new_patron boolean,
|
new_patron boolean,
|
||||||
PRIMARY KEY(id),
|
PRIMARY KEY(id),
|
||||||
CONSTRAINT fk_guild
|
CONSTRAINT fk_guild
|
||||||
@@ -45,7 +45,7 @@ BEGIN;
|
|||||||
id varchar(30),
|
id varchar(30),
|
||||||
created_at timestamp,
|
created_at timestamp,
|
||||||
modified_at timestamp,
|
modified_at timestamp,
|
||||||
content varchar(2000)
|
content varchar(2000),
|
||||||
previous_content varchar(2000)[],
|
previous_content varchar(2000)[],
|
||||||
channel_id varchar(30),
|
channel_id varchar(30),
|
||||||
author_id varchar(30),
|
author_id varchar(30),
|
||||||
@@ -89,7 +89,7 @@ BEGIN;
|
|||||||
REFERENCES roles(id)
|
REFERENCES roles(id)
|
||||||
ON DELETE SET NULL,
|
ON DELETE SET NULL,
|
||||||
CONSTRAINT fk_tier
|
CONSTRAINT fk_tier
|
||||||
FOREIGN_KEY(next_tier)
|
FOREIGN KEY(next_tier)
|
||||||
REFERENCES patreon_tier(id)
|
REFERENCES patreon_tier(id)
|
||||||
ON DELETE SET NULL
|
ON DELETE SET NULL
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user