Skip to content

Commit

Permalink
ci:merge main to release
Browse files Browse the repository at this point in the history
  • Loading branch information
rjsparks authored Sep 28, 2023
2 parents 554e736 + 2fefde8 commit 3196403
Show file tree
Hide file tree
Showing 67 changed files with 780 additions and 414 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-base-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Build & Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: docker/base.Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-celery-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Build & Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: dev/celery/Dockerfile
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/build-mq-broker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:

workflow_dispatch:

env:
RABBITMQ_VERSION: 3.12-alpine

jobs:
publish:
runs-on: ubuntu-latest
Expand All @@ -21,24 +24,26 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Build & Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: dev/mq/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/ietf-tools/datatracker-mq:latest

build-args: RABBITMQ_VERSION=${{ env.RABBITMQ_VERSION }}
tags: |
ghcr.io/ietf-tools/datatracker-mq:${{ env.RABBITMQ_VERSION }}
ghcr.io/ietf-tools/datatracker-mq:latest
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:

- name: Update Baseline Coverage
uses: ncipollo/release-action@v1.13.0
if: ${{ github.event.inputs.updateCoverage == 'true' }}
if: ${{ github.event.inputs.updateCoverage == 'true' || github.ref_name == 'release' }}
with:
allowUpdates: true
tag: baseline
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-assets-sync-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
- uses: actions/checkout@v4

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker Build & Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: dev/shared-assets-sync/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
echo "Running tests..."
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
echo "Lower coverage failures will be ignored."
./ietf/manage.py test --validate-html-harder --settings=settings_test --ignore-lower-coverage
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
else
./ietf/manage.py test --validate-html-harder --settings=settings_test
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
fi
coverage xml
Expand Down
236 changes: 128 additions & 108 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
74 changes: 37 additions & 37 deletions dev/coverage-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dev/coverage-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"author": "IETF Trust",
"license": "BSD-3-Clause",
"dependencies": {
"@actions/core": "1.10.0",
"@actions/core": "1.10.1",
"@actions/github": "5.1.1",
"chart.js": "3.5.1",
"chartjs-node-canvas": "4.1.6",
"lodash": "4.17.21",
"luxon": "3.4.0"
"luxon": "3.4.3"
},
"devDependencies": {
"eslint": "8.48.0",
"eslint": "8.49.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-node": "11.1.0",
Expand Down
30 changes: 15 additions & 15 deletions dev/deploy-to-container/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dev/deploy-to-container/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"dependencies": {
"dockerode": "^3.3.5",
"fs-extra": "^11.1.1",
"nanoid": "4.0.2",
"nanoid": "5.0.1",
"nanoid-dictionary": "5.0.0-beta.1",
"slugify": "1.6.6",
"tar": "^6.1.15",
"tar": "^6.2.0",
"yargs": "^17.7.2"
},
"engines": {
Expand Down
Loading

0 comments on commit 3196403

Please sign in to comment.