NiX
/
slackbuilds
4
2
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity
Browse Source

Removed dark-term patch (#75) 

Renamed upstream packages

Removed dark-term patch

Co-authored-by: Mykyta Solomko <sev@nix.org.ua>
Reviewed-on: #75
Co-Authored-By: Mykyta Solomko <sev@no-reply.code.nix.org.ua>
Co-Committed-By: Mykyta Solomko <sev@no-reply.code.nix.org.ua>
pull/76/head
Mykyta Solomko 5 years ago
parent
7331a3732d
commit
6632dd6448
7 changed files with 57 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      woodpecker-agent-git/woodpecker-agent-git.SlackBuild
  2. 2
      woodpecker-agent-git/woodpecker-agent-git.info
  3. 5
      woodpecker-agent/woodpecker-agent.SlackBuild
  4. 80
      woodpecker-server-git/dark-term.patch
  5. 52
      woodpecker-server-git/woodpecker-server-git.SlackBuild
  6. 2
      woodpecker-server-git/woodpecker-server-git.info
  7. 5
      woodpecker-server/woodpecker-server.SlackBuild

31
woodpecker-agent-git/woodpecker-agent.SlackBuild → woodpecker-agent-git/woodpecker-agent-git.SlackBuild
View File

@ -29,8 +29,9 @@
# * 2020.12.01 - version 0.12.0
# * 2021.04.15 - version 0.13.0-rc.3
# * 2021.05.07 - git version
# * 2021.05.11 - renamed package
PRGNAM=woodpecker-agent
PRGNAM=woodpecker-agent-git
SRCNAM=woodpecker
VERSION=$(date +%Y%m%d)
BUILD=${BUILD:-1}
@ -111,22 +112,26 @@ cp -a \
cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
mkdir -p ${PKG}/install
# slack-desc
cat > ${PKG}/install/slack-desc << EOF
|-----handy-ruler------------------------------------------------------|
woodpecker-agent: Woodpecker (continuous delivery platform agent)
woodpecker-agent:
woodpecker-agent: Woodpecker is a Continuous Delivery platform built on Docker,
woodpecker-agent: written in Go
woodpecker-agent:
woodpecker-agent: Homepage: https://woodpecker.laszlo.cloud/
woodpecker-agent:
woodpecker-agent:
woodpecker-agent:
woodpecker-agent:
woodpecker-agent:
|-----handy-ruler------------------------------------------------------|
woodpecker-agent-git: Woodpecker (continuous delivery platform agent)
woodpecker-agent-git:
woodpecker-agent-git: Woodpecker is a Continuous Delivery platform built on Docker,
woodpecker-agent-git: written in Go
woodpecker-agent-git:
woodpecker-agent-git: Homepage: https://woodpecker.laszlo.cloud/
woodpecker-agent-git:
woodpecker-agent-git:
woodpecker-agent-git:
woodpecker-agent-git:
woodpecker-agent-git:
EOF
# slack-conflicts
echo 'woodpecker-agent' > ${PKG}/install/slack-conflictsslack-conflicts
# doinst.sh
sed -e "s|%DRONEUSER%|${DRONEUSER}|g" \
-e "s|%DRONEGROUP%|${DRONEGROUP}|g" \

2
woodpecker-server-git/woodpecker-server.info → woodpecker-agent-git/woodpecker-agent-git.info
View File

@ -1,4 +1,4 @@
PRGNAM="woodpecker-server"
PRGNAM="woodpecker-agent-git"
VERSION="git"
HOMEPAGE="https://woodpecker.io/"
DOWNLOAD="https://github.com/laszlocph/woodpecker/"

5
woodpecker-agent/woodpecker-agent.SlackBuild
View File

@ -28,6 +28,7 @@
# * 2020.11.05 - version 0.11.0
# * 2020.12.01 - version 0.12.0
# * 2021.04.15 - version 0.13.0-rc.3
# * 2021.05.11 - added slack-conflicts
PRGNAM=woodpecker-agent
SRCNAM=woodpecker
@ -106,6 +107,7 @@ cp -a \
cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
mkdir -p ${PKG}/install
# slack-desc
cat > ${PKG}/install/slack-desc << EOF
|-----handy-ruler------------------------------------------------------|
@ -122,6 +124,9 @@ woodpecker-agent:
woodpecker-agent:
EOF
# slack-conflicts
echo 'woodpecker-agent' > ${PKG}/install/slack-conflicts
# doinst.sh
sed -e "s|%DRONEUSER%|${DRONEUSER}|g" \
-e "s|%DRONEGROUP%|${DRONEGROUP}|g" \

80
woodpecker-server-git/dark-term.patch
View File

@ -1,80 +0,0 @@
diff --git a/web/src/screens/repo/screens/build/logs/components/term.less b/web/src/screens/repo/screens/build/logs/components/term.less
index cb8c4e83..9632ef4b 100644
--- a/web/src/screens/repo/screens/build/logs/components/term.less
+++ b/web/src/screens/repo/screens/build/logs/components/term.less
@@ -2,14 +2,14 @@
@import '~shared/styles/ansi';
.term {
- background: @gray-light;
+ background: @gray-dark;
border-radius: 2px;
padding: 20px;
.exitcode {
-moz-user-select: none;
-webkit-user-select: none;
- color: rgba(0, 0, 0, 0.3);
+ color: rgba(255, 255, 255, 0.6);
font-family: 'Roboto Mono', monospace;
font-size: 13px;
margin-top: 10px;
@@ -21,7 +21,7 @@
.line {
- color: @gray-dark;
+ color: @white;
display: flex;
line-height: 19px;
max-width: 100%;
@@ -35,12 +35,12 @@
a {
text-decoration: none;
- color: rgba(0, 0, 0, 0.3);
+ color: rgba(255, 255, 255, 0.6);
}
div:first-child {
-webkit-user-select: none;
- color: rgba(0, 0, 0, 0.3);
+ color: rgba(255, 255, 255, 0.6);
min-width: 20px;
padding-right: 20px;
user-select: none;
@@ -55,7 +55,7 @@
div:last-child {
-webkit-user-select: none;
- color: rgba(0, 0, 0, 0.3);
+ color: rgba(255, 255, 255, 0.6);
padding-left: 20px;
user-select: none;
}
@@ -63,13 +63,15 @@
.highlight {
.line;
+ color: @black;
background-color: @yellow;
}
// log loading message
.loading {
- background: @gray-light;
+ background: @gray-dark;
border-radius: 2px;
+ color: @white;
font-family: 'Roboto Mono', monospace;
font-size: 13px;
padding: 20px;
@@ -77,7 +79,7 @@
// log error message
.error {
- background: @gray-light;
+ background: @gray-dark;
border-radius: 2px;
color: @red;
font-size: 14px;

52
woodpecker-server-git/woodpecker-server.SlackBuild → woodpecker-server-git/woodpecker-server-git.SlackBuild
View File

@ -30,8 +30,10 @@
# * 2021.04.15 - version 0.13.0-rc.3
# * 2021.05.07 - git version
# * 2021.05.09 - dark terminal patch
# * 2021.05.10 - dark terminal patch accepted into upstream
# * 2021.05.11 - renamed package
PRGNAM=woodpecker-server
PRGNAM=woodpecker-server-git
SRCNAM=woodpecker
VERSION=$(date +%Y%m%d)
BUILD=${BUILD:-1}
@ -98,18 +100,14 @@ cd "${GOPATH}/src/github.com/laszlocph/woodpecker"
# Get dependencies
go get -v ./...
# Apply patch for dark terminal
# and rebuild front-end
if [[ ${WOODPECKER_DARK_TERM} == yes ]]; then
go get github.com/bradrydzewski/togo
patch -p1 --verbose < ${CWD}/dark-term.patch
pushd web/
yarn install
yarn build
go generate ./...
go install ./...
popd
fi
# Build front-end
go get github.com/bradrydzewski/togo
pushd web/
yarn install
yarn build
go generate ./...
go install ./...
popd
# Build server
go build -ldflags '-extldflags "-static" -X github.com/laszlocph/woodpecker/version.Version='"${VERSION}" -v -o release/woodpecker-server github.com/laszlocph/woodpecker/cmd/drone-server
@ -136,22 +134,26 @@ cp -a \
cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
mkdir -p ${PKG}/install
# slack-desc
cat > ${PKG}/install/slack-desc << EOF
|-----handy-ruler------------------------------------------------------|
woodpecker-server: Woodpecker (continuous delivery platform server)
woodpecker-server:
woodpecker-server: Woodpecker is a Continuous Delivery platform built on Docker,
woodpecker-server: written in Go
woodpecker-server:
woodpecker-server: Homepage: https://woodpecker.laszlo.cloud/
woodpecker-server:
woodpecker-server:
woodpecker-server:
woodpecker-server:
woodpecker-server:
|-----handy-ruler------------------------------------------------------|
woodpecker-server-git: Woodpecker (continuous delivery platform server)
woodpecker-server-git:
woodpecker-server-git: Woodpecker is a Continuous Delivery platform built on Docker,
woodpecker-server-git: written in Go
woodpecker-server-git:
woodpecker-server-git: Homepage: https://woodpecker.laszlo.cloud/
woodpecker-server-git:
woodpecker-server-git:
woodpecker-server-git:
woodpecker-server-git:
woodpecker-server-git:
EOF
# slack-conflicts
echo 'woodpecker-server' > ${PKG}/install/slack-conflicts
# doinst.sh
sed -e "s|%WOODPECKERUSER%|${WOODPECKERUSER}|g" \
-e "s|%WOODPECKERGROUP%|${WOODPECKERGROUP}|g" \

2
woodpecker-agent-git/woodpecker-agent.info → woodpecker-server-git/woodpecker-server-git.info
View File

@ -1,4 +1,4 @@
PRGNAM="woodpecker-agent"
PRGNAM="woodpecker-server-git"
VERSION="git"
HOMEPAGE="https://woodpecker.io/"
DOWNLOAD="https://github.com/laszlocph/woodpecker/"

5
woodpecker-server/woodpecker-server.SlackBuild
View File

@ -29,6 +29,7 @@
# * 2020.12.01 - version 0.12.0
# * 2021.04.15 - version 0.13.0-rc.3
# * 2021.05.09 - dark terminal patch
# * 2021.05.11 - added slack-conflicts file
PRGNAM=woodpecker-server
SRCNAM=woodpecker
@ -130,6 +131,7 @@ cp -a \
cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
mkdir -p ${PKG}/install
# slack-desc
cat > ${PKG}/install/slack-desc << EOF
|-----handy-ruler------------------------------------------------------|
@ -146,6 +148,9 @@ woodpecker-server:
woodpecker-server:
EOF
# slack-conflicts
echo 'woodpecker-server-git' > ${PKG}/install/slack-conflicts
# doinst.sh
sed -e "s|%WOODPECKERUSER%|${WOODPECKERUSER}|g" \
-e "s|%WOODPECKERGROUP%|${WOODPECKERGROUP}|g" \

Write Preview
Loading…
Cancel
Save