Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
bazel-release_task:
bazel-opt_task:
container:
image: toxchat/toktok-stack:0.0.31-release
cpu: 2
Expand All @@ -9,5 +9,4 @@ bazel-release_task:
test_all_script:
- cd /src/workspace && bazel test -k
--remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
--config=release
//hs-github-tools/...
3 changes: 1 addition & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ branches:
protection:
required_status_checks:
contexts:
- "bazel-release"
- "bazel-opt"
- "build / cabal"
- "build / stack"
- "code-review/reviewable"
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ on:
jobs:
publish:
uses: TokTok/ci-tools/.github/workflows/haskell-publish.yml@master
secrets:
API_TOKEN_HACKAGE: ${{ secrets.API_TOKEN_HACKAGE }}
2 changes: 2 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ load("@rules_haskell//haskell:defs.bzl", "haskell_library")
load("//third_party/haskell/hspec-discover:build_defs.bzl", "hspec_test")
load("//tools/project:build_defs.bzl", "project")

package(features = ["-layering_check"])

project()

haskell_library(
Expand Down
5 changes: 3 additions & 2 deletions tools/git-submit
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,18 @@ BRANCH="${1-$(git rev-parse --abbrev-ref HEAD)}"
if (echo "$BRANCH" | grep ':' >/dev/null); then
REMOTE="$(echo "$BRANCH" | grep -o '^[^:]*')"
BRANCH="$(echo "$BRANCH" | grep -o '[^:]*$')"
REMOTE="$(git remote -v | grep ":$REMOTE/.* (push)" | grep -o '^\S*')"
REMOTE="$(git remote -v | grep -i ":$REMOTE/.* (push)" | grep -o '^\S*')"
fi

if [ -n "$REMOTE" ] && ! (git branch | grep "^..$BRANCH\$" >/dev/null); then
git checkout --track "$REMOTE/$BRANCH"
else
REMOTE=origin
git checkout "$BRANCH"
fi

git push upstream "$BRANCH:master"
git sync
git branch -d "$BRANCH"
sleep 2
git push origin ":$BRANCH"
git push "$REMOTE" ":$BRANCH"