THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Update build tags for sqlite_unlock_notify (#5144)

tags/v1.7.0-dev
Mura Li Lunny Xiao <xiaolunwen@gmail.com> 1 year ago
parent
commit
25c49cf930
7 changed files with 24 additions and 23 deletions
  1. +16
    -15
      .drone.yml
  2. +1
    -1
      Dockerfile
  3. +3
    -3
      Makefile
  4. +1
    -1
      contrib/ide/vscode/launch.json
  5. +1
    -1
      contrib/ide/vscode/tasks.json
  6. +1
    -1
      docker/Makefile
  7. +1
    -1
      snap/snapcraft.yaml

+ 16
- 15
.drone.yml View File

@@ -67,7 +67,7 @@ pipeline:
image: golang:1.11
pull: true
environment:
TAGS: bindata sqlite
TAGS: bindata sqlite sqlite_unlock_notify
commands:
- make clean
- make generate
@@ -87,7 +87,7 @@ pipeline:
pull: true
group: test
environment:
TAGS: bindata sqlite
TAGS: bindata sqlite sqlite_unlock_notify
commands:
- make unit-test-coverage
when:
@@ -99,7 +99,7 @@ pipeline:
pull: true
group: test
environment:
TAGS: bindata sqlite
TAGS: bindata sqlite sqlite_unlock_notify
commands:
- make test
when:
@@ -117,17 +117,18 @@ pipeline:
when:
event: [ tag ]

# Commented until db locking have been resolved!
# test-sqlite:
# image: golang:1.10
# pull: true
# group: test
# environment:
# TAGS: bindata
# commands:
# - make test-sqlite
# when:
# event: [ push, tag, pull_request ]
test-sqlite:
image: golang:1.11
pull: true
group: test
environment:
TAGS: bindata
commands:
- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
- apt-get install -y git-lfs
- make test-sqlite
when:
event: [ push, tag, pull_request ]

test-mysql:
image: golang:1.11
@@ -196,7 +197,7 @@ pipeline:
image: karalabe/xgo-latest:latest
pull: true
environment:
TAGS: bindata sqlite
TAGS: bindata sqlite sqlite_unlock_notify
commands:
- export PATH=$PATH:$GOPATH/bin
- make release


+ 1
- 1
Dockerfile View File

@@ -4,7 +4,7 @@
FROM golang:1.10-alpine3.7 AS build-env

ARG GITEA_VERSION
ARG TAGS="sqlite"
ARG TAGS="sqlite sqlite_unlock_notify"
ENV TAGS "bindata $TAGS"

#Build deps


+ 3
- 3
Makefile View File

@@ -159,7 +159,7 @@ fmt-check:

.PHONY: test
test:
$(GO) test -tags=sqlite $(PACKAGES)
$(GO) test -tags='sqlite sqlite_unlock_notify' $(PACKAGES)

.PHONY: coverage
coverage:
@@ -170,7 +170,7 @@ coverage:

.PHONY: unit-test-coverage
unit-test-coverage:
for PKG in $(PACKAGES); do $(GO) test -tags=sqlite -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
for PKG in $(PACKAGES); do $(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;

.PHONY: vendor
vendor:
@@ -234,7 +234,7 @@ integrations.test: $(SOURCES)
$(GO) test -c code.gitea.io/gitea/integrations -o integrations.test

integrations.sqlite.test: $(SOURCES)
$(GO) test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite'
$(GO) test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'

integrations.cover.test: $(SOURCES)
$(GO) test -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test


+ 1
- 1
contrib/ide/vscode/launch.json View File

@@ -19,7 +19,7 @@
"type": "go",
"request": "launch",
"mode": "debug",
"buildFlags": "-tags=\"sqlite\"",
"buildFlags": "-tags=\"sqlite sqlite_unlock_notify\"",
"port": 2345,
"host": "127.0.0.1",
"program": "${workspaceRoot}/main.go",


+ 1
- 1
contrib/ide/vscode/tasks.json View File

@@ -35,7 +35,7 @@
"focus": false,
"panel": "shared"
},
"args": ["build", "-tags=\"sqlite\""],
"args": ["build", "-tags=\"sqlite sqlite_unlock_notify\""],
"linux": {
"args": ["-o", "gitea", "${workspaceRoot}/main.go"]
},


+ 1
- 1
docker/Makefile View File

@@ -8,7 +8,7 @@ DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG)
.PHONY: docker
docker:
docker build --disable-content-trust=false -t $(DOCKER_REF) .
# support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite" .
# support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify" .

.PHONY: docker-build
docker-build:


+ 1
- 1
snap/snapcraft.yaml View File

@@ -67,7 +67,7 @@ parts:
export GOPATH=$SNAPCRAFT_PART_INSTALL/../go
go get -u github.com/jteeuwen/go-bindata/...
cd $GOPATH/src/code.gitea.io/gitea
TAGS="bindata sqlite pam cert" make generate build
TAGS="bindata sqlite sqlite_unlock_notify pam cert" make generate build
install: |
# Set Convenience Variables
src=$SNAPCRAFT_PART_INSTALL/../go/src/code.gitea.io/gitea


Loading…
Cancel
Save