Skip to content

Commit

Permalink
Merge branch '5.0-trunk'
Browse files Browse the repository at this point in the history
  • Loading branch information
sunnavy committed May 6, 2024
2 parents da9f042 + 0dd5570 commit 0ed12ac
Show file tree
Hide file tree
Showing 143 changed files with 780 additions and 369 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/github-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
run: |
echo "RT_BRANCH_NAME=${GITHUB_REF#refs/heads/}" >>"$GITHUB_ENV"
echo "RT_GA_START_TIME=$(date +%s)" >>"$GITHUB_ENV"
echo "DOCKER_BUILDKIT=0" >> $GITHUB_ENV
docker network create rt
- name: Check out RTIR
uses: actions/checkout@v2
Expand Down Expand Up @@ -73,6 +74,7 @@ jobs:
run: |
echo "RT_BRANCH_NAME=${GITHUB_REF#refs/heads/}" >>"$GITHUB_ENV"
echo "RT_GA_START_TIME=$(date +%s)" >>"$GITHUB_ENV"
echo "DOCKER_BUILDKIT=0" >> $GITHUB_ENV
docker network create rt
- name: Check out RTIR
uses: actions/checkout@v2
Expand Down Expand Up @@ -122,6 +124,7 @@ jobs:
run: |
echo "RT_BRANCH_NAME=${GITHUB_REF#refs/heads/}" >>"$GITHUB_ENV"
echo "RT_GA_START_TIME=$(date +%s)" >>"$GITHUB_ENV"
echo "DOCKER_BUILDKIT=0" >> $GITHUB_ENV
docker network create rt
- name: Check out RTIR
uses: actions/checkout@v2
Expand Down
339 changes: 339 additions & 0 deletions COPYING

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bpssysadmin/rt-base-debian:RT-5.0.3-buster-20230421
FROM bpssysadmin/rt-base-debian:RT-5.0.6-bullseye-20240430

LABEL maintainer="Best Practical Solutions <[email protected]>"

Expand Down
5 changes: 4 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
.travis.yml
bin/add_constituency.in
CHANGES
COPYING
Dockerfile
docs/AdministrationTutorial.pod
docs/Constituencies.pod
docs/DocIndex.pod
docs/images/rtir-incident-dashboard.png
docs/Tutorial.pod
docs/UPGRADING
docs/UPGRADING-2.4
Expand Down Expand Up @@ -220,7 +222,8 @@ MANIFEST.SKIP
META.yml
po/README
po/rtir.pot
README
README.md
SECURITY.md
static/css/rtir-reporting.css
static/css/rtir-styles.css
static/images/RTIR/logo.png
Expand Down
2 changes: 1 addition & 1 deletion META.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ requires:
perl: 5.10.1
resources:
license: http://opensource.org/licenses/gpl-license.php
version: 5.0.4
version: 5.0.6
x_module_install_rtx_version: '0.43'
x_requires_rt: 5.0.0
x_rt_too_new: 5.2.0
220 changes: 0 additions & 220 deletions README

This file was deleted.

Loading

0 comments on commit 0ed12ac

Please sign in to comment.