Skip to content

Commit 9cbdf12

Browse files
committed
testing new ci
Signed-off-by: Doug Davis <duglin@gmail.com>
1 parent 42c7d4c commit 9cbdf12

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- master
66

77
env:
8-
IMAGE: ghcr.io/xregistry/server/xreg-server
8+
OLD_IMAGE: ghcr.io/$GIT_ORG/xreg-server
99

1010
jobs:
1111
build_test_push:
@@ -14,12 +14,15 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616

17+
- name: Set IMAGE env var (need to be indirect due to user of env var)
18+
run: echo "IMAGE=ghcr.io/${GIT_ORG}/xreg-server" >> $GITHUB_ENV
19+
1720
- name: ghcr.io login
1821
uses: docker/login-action@v3
1922
with:
2023
registry: ghcr.io
21-
username: ${{ github.repository_owner }}
22-
password: ${{ secrets.GHCR_TOKEN }}
24+
username: ${{ github.actor }}
25+
password: ${{ secrets.GITHUB_TOKEN }}
2326

2427
- name: build, test, push
2528
run: make mysql test push

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ export XR_MODEL_PATH=.:./spec:$(XR_SPEC)
2525

2626
cmds: .cmds
2727
.cmds: server xr xrconform
28+
env | sort
29+
exit 1
2830
@touch .cmds
2931

3032
qtest: .test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To run the official image:
1212
```
1313
# You need to have Docker installed
1414
15-
docker run -ti -p 8080:8080 ghcr.io/xregistry/server/xreg-server-all
15+
docker run -ti -p 8080:8080 ghcr.io/xregistry/xreg-server-all
1616
```
1717

1818
To build and run it locally:

misc/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: xreg-server
77
spec:
88
containers:
9-
- image: ghcr.io/xregistry/server/xreg-server
9+
- image: ghcr.io/xregistry/xreg-server
1010
imagePullPolicy: Never
1111
name: xreg-server
1212
command: [ "/server" ]

0 commit comments

Comments
 (0)