Skip to content

Commit

Permalink
Copy some dev updates from wip-redis branch
Browse files Browse the repository at this point in the history
  • Loading branch information
markphelps committed Jun 23, 2022
1 parent 32bc578 commit 85088db
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 49 deletions.
9 changes: 4 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/docker-existing-dockerfile
{
"name": "Flipt",
"image": "ghcr.io/markphelps/flipt-dev",
// "build": {
// "context": "..",
// "dockerfile": "../Dockerfile"
// },
"build": {
"context": "..",
"dockerfile": "../Dockerfile"
},
// Set *default* container specific settings.json values on container create.
"settings": {
"go.toolsManagement.checkForUpdates": "local",
Expand Down
41 changes: 0 additions & 41 deletions .github/workflows/dev-image.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/integration-test-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build/Push Integration Test Image
on:
workflow_dispatch:
schedule:
- cron: 0 0 1 * *
- cron: 10 0 * * 0 # weekly, sunday at 00:10

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN apt-get update && \
apt-get -y install --no-install-recommends \
curl \
gnupg \
silversearcher-ag \
sudo \
openssh-server \
postgresql-client && \
Expand Down
14 changes: 12 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ tasks:
deps: [assets:deps]
cmds:
- cd ui && yarn build
vars:
NODE_OPTIONS: --openssl-legacy-provider
sources:
- ./ui/static/*
- ./ui/src/**/*
Expand All @@ -48,6 +50,14 @@ tasks:
cmds:
- ./script/bootstrap

build:
desc: Run Go build
cmds:
- go build -trimpath -tags assets -ldflags "-X main.commit={{.GIT_COMMIT}}" -o ./bin/{{.PROJECT}} ./cmd/{{.PROJECT}}/.
vars:
GIT_COMMIT:
sh: set -e && git rev-parse --verify HEAD || ""

build:clients:
desc: Generate Ruby and Go proto clients
deps: [proto]
Expand Down Expand Up @@ -101,7 +111,7 @@ tasks:
fmt:
desc: Run goimports
cmds:
- goimports -w .
- goimports -w $(go list -f {{`{{.Dir}}`}} ./... | grep -v /rpc/)

lint:
desc: Run the linters
Expand All @@ -117,4 +127,4 @@ tasks:
COVERAGE_FILE: coverage.txt
TEST_PATTERN: .
TEST_FLAGS: -v
TEST_OPTS:
TEST_OPTS: -race

0 comments on commit 85088db

Please sign in to comment.