Skip to content

Commit af6499a

Browse files
fixing release workflows (#19)
1 parent 25356e4 commit af6499a

File tree

7 files changed

+46
-35
lines changed

7 files changed

+46
-35
lines changed

.github/workflows/texer.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
ORG_NAMESPACE: opencyphal
1212
IMAGE_NAME: texer
13-
IMAGE_VERSION_PREFIX: tev
13+
IMAGE_VERSION_PREFIX: te
1414

1515
jobs:
1616

@@ -21,11 +21,16 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v3
2323

24+
- name: process event
25+
id: process_event
26+
uses: olegtarasov/[email protected]
27+
with:
28+
tagRegex: "(${{ env.IMAGE_VERSION_PREFIX }}).*"
2429
- name: dryrun-build
25-
if: ${{ github.event_name == 'pull_request' }}
30+
if: ${{ github.event_name == 'pull_request' || ( github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && github.event.release.prerelease ) }}
2631
run: docker build ./${{ env.IMAGE_NAME }}
2732
- name: build-and-push
28-
if: ${{ github.event_name == 'release' && startsWith(github.ref, env.IMAGE_VERSION_PREFIX) }}
33+
if: ${{ github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && !github.event.release.prerelease }}
2934
uses: macbre/push-to-ghcr@master
3035
with:
3136
context: ./${{ env.IMAGE_NAME }}

.github/workflows/toolshed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
ORG_NAMESPACE: opencyphal
1212
IMAGE_NAME: toolshed
13-
IMAGE_VERSION_PREFIX: tsv
13+
IMAGE_VERSION_PREFIX: ts
1414

1515
jobs:
1616

.github/workflows/toxic.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
ORG_NAMESPACE: opencyphal
1212
IMAGE_NAME: toxic
13-
IMAGE_VERSION_PREFIX: txv
13+
IMAGE_VERSION_PREFIX: tx
1414

1515
jobs:
1616

@@ -21,11 +21,16 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v3
2323

24+
- name: process event
25+
id: process_event
26+
uses: olegtarasov/[email protected]
27+
with:
28+
tagRegex: "(${{ env.IMAGE_VERSION_PREFIX }}).*"
2429
- name: dryrun-build
25-
if: ${{ github.event_name == 'pull_request' }}
30+
if: ${{ github.event_name == 'pull_request' || ( github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && github.event.release.prerelease ) }}
2631
run: docker build ./${{ env.IMAGE_NAME }}
2732
- name: build-and-push
28-
if: ${{ github.event_name == 'release' && startsWith(github.ref, env.IMAGE_VERSION_PREFIX) }}
33+
if: ${{ github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && !github.event.release.prerelease }}
2934
uses: macbre/push-to-ghcr@master
3035
with:
3136
context: ./${{ env.IMAGE_NAME }}

README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ containers to get consistent build results in your local development environment
1111
To allow hosting of multiple container builds from a single repo each toolchain container
1212
is assigned a prefix. For every release event in this repo the workflow triggered is based
1313
on that prefix in the release tag. For example, by creating a release with the tag `tsv18.4.1-alpha`
14-
the release workflow for the `toolshed` container will be triggered.
14+
the release workflow for the `toolshed` container will be triggered (note that the 'v' in 'tsv' will be
15+
elided by the release action).
1516

16-
### opencyphal/toolshed:tsv
17+
### opencyphal/toolshed:ts
1718

1819
The [Open Cyphal toolshed
1920
container](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed)
@@ -25,19 +26,19 @@ like [libcanard](https://github.com/OpenCyphal/libcanard) and
2526

2627
| tag | Python | Gcc | Clang | Cmake | Other Utilities |
2728
|----------|--------|-----|-------|-------|-----------------|
28-
| [tsv20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed/70028521?tag=tsv20.4.1) | 3.10 | 9.3.0 | 10.0.0 | 3.16.3 | <ul><li>qemu</li><li>can-utils</li><li>sonar-scanner</li></ul> |
29+
| [ts20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 9.3.0 | 10.0.0 | 3.16.3 | <ul><li>qemu</li><li>can-utils</li><li>sonar-scanner</li></ul> |
2930

3031
You can use this in your workflow yaml like this:
3132

3233
```none
3334
jobs:
3435
my-job:
3536
runs-on: ubuntu-latest
36-
container: ghcr.io/opencyphal/toolshed:tsv20.4.1
37+
container: ghcr.io/opencyphal/toolshed:ts20.4.1
3738
```
3839

3940

40-
### opencyphal/texer:tev
41+
### opencyphal/texer:te
4142

4243
The [Open Cyphal texer
4344
container](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/texer)
@@ -47,20 +48,20 @@ is based on Ubuntu and provides the necessary compilers and utilities to author
4748

4849
| tag | Python | Tex Live | git | Other Utilities |
4950
|----------|--------|----------|-----|-----------------|
50-
| [tev20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/texer/70028521?tag=tsv20.4.1) | 3.11 | 2019 | 2.25.1 | <ul><li>python pygments</li><li>lyx</li><li>inkscape</li></ul> |
51+
| [te20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/texer) | 3.11 | 2019 | 2.25.1 | <ul><li>python pygments</li><li>lyx</li><li>inkscape</li></ul> |
5152

5253
You can use this in your workflow yaml like this:
5354

5455
```none
5556
jobs:
5657
my-job:
5758
runs-on: ubuntu-latest
58-
container: ghcr.io/opencyphal/texer:tev20.4.1
59+
container: ghcr.io/opencyphal/texer:te20.4.1
5960
```
6061

6162

6263

63-
### opencyphal/toxic:txv
64+
### opencyphal/toxic:tx
6465

6566

6667
The [Open Cyphal toxic
@@ -71,13 +72,13 @@ is based on Ubuntu and provides all modern Python3 distributions, pip, tox, and
7172

7273
| tag | Base Python | Python Versions | Tox | Nox | pip | Other Utilities |
7374
|----------|-------------|-----------------|-----|-----|-----|-----------------|
74-
| [txv20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toxic/70031935?tag=txv20.4.1) | 3.8 | 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12 | 4.4.5 | (not available) | 20.0.2 | <ul><li>sonar-scanner</li></ul> |
75+
| [tx20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toxic) | 3.8 | 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12 | 4.4.5 | (not available) | 20.0.2 | <ul><li>sonar-scanner</li></ul> |
7576

7677
You can use this in your workflow yaml like this:
7778

7879
```none
7980
jobs:
8081
my-job:
8182
runs-on: ubuntu-latest
82-
container: ghcr.io/opencyphal/toxic:txv20.4.1
83+
container: ghcr.io/opencyphal/toxic:tx20.4.1
8384
```

texer/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# texer (tev): The OpenCyphal Toolchain Container for Python
1+
# texer (te): The OpenCyphal Toolchain Container for Python
22

33
The `opencyphal/texer` container provides a consistent build and test environment for authoring, continuous-integration,
44
and publication of OpenCyphal [LaTeX](https://www.latex-project.org/) documents.
55

66
## Official Release
77

88
To release a new build of this container simply create a [new github release](https://github.com/OpenCyphal/docker_toolchains/releases/new)
9-
that starts with `tev`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
9+
that starts with `te`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
1010
For example `tev20.4.1`will cause the Github workflow to rebuild and push the `opencyphal/texer` container with the
11-
tag `tev20.4.1`.
11+
tag `te20.4.1` (where the release workflow elides the 'v').
1212

1313
***PLEASE UPDATE THE TOP-LEVEL README.md FOR EACH NEW RELEASE***
1414

@@ -32,19 +32,19 @@ echo $FGP | docker login ghcr.io -u (github username) --password-stdin
3232
... now build (where x is the next version number for the container):
3333

3434
```bash
35-
docker build -t ghcr.io/opencyphal/texer:tev20.4.x .
35+
docker build -t ghcr.io/opencyphal/texer:te20.4.x .
3636
```
3737

3838
... and finally, push.
3939

4040
```bash
41-
docker push ghcr.io/opencyphal/texer:tev20.4.x
41+
docker push ghcr.io/opencyphal/texer:te20.4.x
4242
```
4343

4444
## Testing out the container
4545

4646
To login to an interactive session do:
4747

4848
```bash
49-
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/texer:tev20.4.x
49+
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/texer:te20.4.x
5050
```

toolshed/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# toolshed (tsv): The OpenCyphal C and C++ toolchain container.
1+
# toolshed (ts): The OpenCyphal C and C++ toolchain container.
22

33
The `opencyphal/toolshed` docker image provides a consistent build and test environment
44
for development, continuous-integration, and test automation of C and C++ based projects.
55

66
## Official Release
77

88
To release a new build of this container simply create a [new github release](https://github.com/OpenCyphal/docker_toolchains/releases/new)
9-
that starts with `tsv`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
9+
that starts with `ts`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
1010
For example `tsv20.4.1`will cause the Github workflow to rebuild and push the `opencyphal/toolshed` container with the
11-
tag `tsv20.4.1`.
11+
tag `ts20.4.1` (where the release workflow elides the 'v').
1212

1313
***PLEASE UPDATE THE TOP-LEVEL README.md FOR EACH NEW RELEASE***
1414

@@ -32,21 +32,21 @@ echo $FGP | docker login ghcr.io -u (github username) --password-stdin
3232
... now build (where x is the next version number for the container):
3333

3434
```bash
35-
docker build -t ghcr.io/opencyphal/toolshed:tsv20.4.x .
35+
docker build -t ghcr.io/opencyphal/toolshed:ts20.4.x .
3636
```
3737

3838
... and finally, push.
3939

4040
```bash
41-
docker push ghcr.io/opencyphal/toolshed:tsv20.4.x
41+
docker push ghcr.io/opencyphal/toolshed:ts20.4.x
4242
```
4343

4444
## Testing out the container
4545

4646
To login to an interactive session do:
4747

4848
```bash
49-
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toolshed:tsv20.4.x
49+
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toolshed:ts20.4.x
5050
```
5151

5252
## Toolchain Documentation

toxic/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# toxic (txv): The OpenCyphal Toolchain Container for Python
1+
# toxic (tx): The OpenCyphal Toolchain Container for Python
22

33
The `opencyphal/toxic` docker image provides a consistent build and test environment
44
for development, continuous-integration, and test automation of Python based projects.
55

66
## Official Release
77

88
To release a new build of this container simply create a [new github release](https://github.com/OpenCyphal/docker_toolchains/releases/new)
9-
that starts with `txv`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
9+
that starts with `tx`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
1010
For example `txv20.4.1`will cause the Github workflow to rebuild and push the `opencyphal/toxic` container with the
11-
tag `txv20.4.1`.
11+
tag `tx20.4.1` (where the release workflow elides the 'v').
1212

1313
***PLEASE UPDATE THE TOP-LEVEL README.md FOR EACH NEW RELEASE***
1414

@@ -32,19 +32,19 @@ echo $FGP | docker login ghcr.io -u (github username) --password-stdin
3232
... now build (where x is the next version number for the container):
3333

3434
```bash
35-
docker build -t ghcr.io/opencyphal/toxic:txv20.4.x .
35+
docker build -t ghcr.io/opencyphal/toxic:tx20.4.x .
3636
```
3737

3838
... and finally, push.
3939

4040
```bash
41-
docker push ghcr.io/opencyphal/toxic:txv20.4.x
41+
docker push ghcr.io/opencyphal/toxic:tx20.4.x
4242
```
4343

4444
## Testing out the container
4545

4646
To login to an interactive session do:
4747

4848
```bash
49-
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toxic:txv20.4.x
49+
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toxic:tx20.4.x
5050
```

0 commit comments

Comments
 (0)