Skip to content

Commit

Permalink
ci: merge main to release (#8448)
Browse files Browse the repository at this point in the history
  • Loading branch information
rjsparks authored Jan 21, 2025
2 parents 2c04f36 + a0a2a61 commit a4eeae5
Show file tree
Hide file tree
Showing 29 changed files with 872 additions and 699 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/build-devblobstore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build Dev/Test Blobstore Docker Image

on:
push:
branches:
- 'main'
paths:
- '.github/workflows/build-devblobstore.yml'

workflow_dispatch:

env:
MINIO_VERSION: latest

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v4

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

- name: Login to GitHub Container Registry
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@v6
env:
DOCKER_BUILD_NO_SUMMARY: true
with:
context: .
file: docker/devblobstore.Dockerfile
platforms: linux/amd64,linux/arm64
push: true
build-args: MINIO_VERSION=${{ env.MINIO_VERSION }}
tags: |
ghcr.io/ietf-tools/datatracker-devblobstore:${{ env.MINIO_VERSION }}
ghcr.io/ietf-tools/datatracker-devblobstore:latest
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
echo "IS_RELEASE=true" >> $GITHUB_ENV
- name: Create Draft Release
uses: ncipollo/release-action@v1.14.0
uses: ncipollo/release-action@v1.15.0
if: ${{ github.ref_name == 'release' }}
with:
prerelease: true
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
histCoveragePath: historical-coverage.json

- name: Create Release
uses: ncipollo/release-action@v1.14.0
uses: ncipollo/release-action@v1.15.0
if: ${{ env.SHOULD_DEPLOY == 'true' }}
with:
allowUpdates: true
Expand All @@ -324,7 +324,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Update Baseline Coverage
uses: ncipollo/release-action@v1.14.0
uses: ncipollo/release-action@v1.15.0
if: ${{ github.event.inputs.updateCoverage == 'true' || github.ref_name == 'release' }}
with:
allowUpdates: true
Expand Down
29 changes: 28 additions & 1 deletion .github/workflows/ci-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,34 @@ on:
- 'package.json'

jobs:
# -----------------------------------------------------------------
# PREPARE
# -----------------------------------------------------------------
prepare:
name: Prepare
runs-on: ubuntu-latest
outputs:
base_image_version: ${{ steps.baseimgversion.outputs.base_image_version }}

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
fetch-tags: false

- name: Get Base Image Target Version
id: baseimgversion
run: |
echo "base_image_version=$(sed -n '1p' dev/build/TARGET_BASE)" >> $GITHUB_OUTPUT
# -----------------------------------------------------------------
# TESTS
# -----------------------------------------------------------------
tests:
name: Run Tests
uses: ./.github/workflows/tests.yml
needs: [prepare]
with:
ignoreLowerCoverage: false
ignoreLowerCoverage: false
skipSelenium: true
targetBaseVersion: ${{ needs.prepare.outputs.base_image_version }}
2 changes: 1 addition & 1 deletion dev/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ietf-tools/datatracker-app-base:20241212T1741
FROM ghcr.io/ietf-tools/datatracker-app-base:20250117T1516
LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion dev/build/TARGET_BASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20241212T1741
20250117T1516
Loading

0 comments on commit a4eeae5

Please sign in to comment.