Skip to content

Commit 2267f10

Browse files
authored
ci: fix ci trigger and gitlab image (#4)
1 parent 26f8053 commit 2267f10

File tree

4 files changed

+3
-85
lines changed

4 files changed

+3
-85
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Merge into master - Build and Run Tests
44

55
on:
66
push:
7-
branches: ["master"]
7+
branches: ["main"]
88

99
env:
1010
REGISTRY: ghcr.io

.github/workflows/pr-development.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: PR development - Build and Run Tests
44

55
on:
66
pull_request:
7-
branches: ["master"]
7+
branches: ["main"]
88

99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/taskr.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
build:
2-
image: ghcr.io/algebraic-programming/taskr/buildenv-x86_64:latest
2+
image: ghcr.io/algebraic-programming/taskr/buildenv:latest
33
variables:
44
GIT_SUBMODULE_STRATEGY: recursive
55
tags:

0 commit comments

Comments
 (0)