Skip to content

Commit

Permalink
Update tag calver dates
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelldls committed Mar 20, 2024
1 parent 09df4f7 commit 3f97fb6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions docs/tutorials/create_beamline.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ You can now give your repository a version tag like this:

```bash
# open a terminal in vscode: Menu -> Terminal -> New Terminal
git tag 2024.2.1
git push origin 2024.2.1
git tag 2024.3.1
git push origin 2024.3.1
```

We use `CalVer` version numbers for beamline repositories and Generic IOCs.
Expand All @@ -116,7 +116,7 @@ CalVer is described here: <https://calver.org/> and is used where semantic
versioning is not appropriate because the repository contains a mix of
dependencies and does not have a clear API.

Note that 2024.2.1 represents the time that this tutorial was last updated.
Note that 2024.3.1 represents the time that this tutorial was last updated.
For completeness you could use the current year and month instead. You
are also free to choose your own versioning scheme as this is not enforced by
any of the epics-containers tools.
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorials/deploy_example.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ You can now see the beta IOC instance running with:
<pre>$ ec ps
| name | version | running | restarts | deployed |
|------------------|---------------|---------|----------|---------------------|
| bl01t-ea-test-01 | 2024.2.8e8b-b | true | 0 | 2024-02-19 10:08:15 |</pre>
| bl01t-ea-test-01 | 2024.3.8e8b-b | true | 0 | 2024-03-19 10:08:15 |</pre>

At the end of the last tutorial we tagged the beamline repository with a
`CalVer` version number and pushed it up to GitHub. This means that we
Expand All @@ -126,7 +126,7 @@ available in the GitHub repository.
<pre>$ ec instances bl01t-ea-test-01
| version |
|----------|
| 2024.2.1 |
| 2024.3.1 |
</pre>

:::{note}
Expand Down Expand Up @@ -156,13 +156,13 @@ This command will extract the IOC instance using the tag from GitHub and deploy
it to your local machine:

```bash
$ ec deploy bl01t-ea-test-01 2024.2.1
$ ec deploy bl01t-ea-test-01 2024.3.1
bdbd155d437361fe88bce0faa0ddd3cd225a9026287ac5e73545aeb4ab3a67e9

$ ec ps -w
| name | version | running | restarts | deployed | image |
|------------------|----------|---------|----------|---------------------|-------------------------------------------------------------------|
| bl01t-ea-test-01 | 2024.2.1 | true | 0 | 2024-02-19 11:10:53 | ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.2.1 |
| bl01t-ea-test-01 | 2024.3.1 | true | 0 | 2024-03-19 11:10:53 | ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.2.1 |
```

### IMPORTANT: deploy-local vs deploy
Expand Down
6 changes: 3 additions & 3 deletions docs/tutorials/ioc_changes1.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ git add .
git commit -m "Added extra.db"
git push
# tag a new version of the beamline repo
git tag 2023.11.2
git push origin 2023.11.2
git tag 2024.3.2
git push origin 2024.3.2
# deploy the new version of the IOC to the local docker / podman instance
ec deploy bl01t-ea-test-02 2023.11.2
ec deploy bl01t-ea-test-02 2024.3.2
```

You can now see that the versioned IOC instance is running and loading the extra.db by looking at its log with:
Expand Down

0 comments on commit 3f97fb6

Please sign in to comment.