Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,22 @@ jobs:
run: |
echo "registry=$(echo '${{ steps.build-meta.outputs.tags }}' | cut -f1 -d:)" | tee -a "$GITHUB_OUTPUT"

- id: set_build_url
name: Set BUILD_URL
run: |
echo "build_url=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" | tee -a "$GITHUB_OUTPUT"

- id: build
name: Build/push the arch-specific image
uses: docker/build-push-action@v6
with:
platforms: ${{ matrix.platform }}
build-args: |
BUILD_TIMESTAMP=${{ github.event.repository.updated_at }}
BUILD_URL=${{ steps.set_build_url.outputs.build_url }}
GIT_REF_NAME=${{ github.ref_name }}
GIT_SHA=${{ github.sha }}
GIT_REPOSITORY_URL=${{ github.repositoryUrl }}
cache-from: type=registry,ref=${{ steps.cache-meta.outputs.tags }}
cache-to: type=registry,ref=${{ steps.cache-meta.outputs.tags }},mode=max
labels: ${{ steps.build-meta.outputs.labels }}
Expand All @@ -74,13 +86,15 @@ jobs:
echo "image-${RUNNER_ARCH,,}=${{ steps.get-registry.outputs.registry }}@${{ steps.build.outputs.digest }}" | tee -a "$GITHUB_OUTPUT"

merge:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
needs: build
env:
DOCKER_APP_IMAGE_ARM64: ${{ needs.build.outputs.image-arm64 }}
DOCKER_APP_IMAGE_X64: ${{ needs.build.outputs.image-x64 }}
outputs:
image: ${{ steps.meta.outputs.tags }}
build-image-arm: ${{ needs.build.outputs.image-arm64 }}
build-image-x64: ${{ needs.build.outputs.image-x64 }}
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -109,7 +123,7 @@ jobs:
"$DOCKER_APP_IMAGE_ARM64" "$DOCKER_APP_IMAGE_X64"

test:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
needs: merge
env:
COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
Expand Down Expand Up @@ -157,17 +171,19 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: Build Report (${{ github.run_id }}_${{ github.run_attempt }})
name: UCBEARS Test Report (${{ github.run_id }}_${{ github.run_attempt }})
path: artifacts/*
if-no-files-found: error

push:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
needs:
- merge
- test
env:
DOCKER_APP_IMAGE: ${{ needs.merge.outputs.image }}
DOCKER_APP_IMAGE_ARM64: ${{ needs.merge.outputs.build-image-arm }}
DOCKER_APP_IMAGE_X64: ${{ needs.merge.outputs.build-image-x64 }}
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -190,6 +206,6 @@ jobs:

- name: Retag and push the image
run: |
docker pull "$DOCKER_APP_IMAGE"
echo "$DOCKER_METADATA_OUTPUT_TAGS" | tr ' ' '\n' | xargs -n1 docker tag "$DOCKER_APP_IMAGE"
docker push --all-tags "$(echo "$DOCKER_APP_IMAGE" | cut -f1 -d:)"
docker buildx imagetools create \
$(jq -cr '.tags | map("--tag " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
$DOCKER_APP_IMAGE_ARM64 $DOCKER_APP_IMAGE_X64
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
env:
BASE_IMAGE: ${{ steps.get-base-image.outputs.tags }}
run: |
docker pull "$BASE_IMAGE"
docker manifest inspect "$BASE_IMAGE"

- name: Produce release tags
id: tag-meta
Expand All @@ -51,9 +51,11 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{version}}


- name: Retag the pulled image
env:
BASE_IMAGE: ${{ steps.get-base-image.outputs.tags }}
run: |
echo "$DOCKER_METADATA_OUTPUT_TAGS" | tr ' ' '\n' | xargs -n1 docker tag "$BASE_IMAGE"
docker push --all-tags "$(echo "$BASE_IMAGE" | cut -f1 -d:)"
docker buildx imagetools create \
"$(jq -cr '.tags | map("--tag " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")" \
"$(echo "$BASE_IMAGE" | cut -f1 -d:)"
34 changes: 34 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
# 1.7.4 (2025-12-17)

* AP-494 move to github

# 1.7.3 (2025-11-25)

* ADA-314 fix icons in items table to make them tab friendly
* Fix ESLint issues
* ADA-323 item keyword search accessibility fixes
* ADA-325 add aria required to term start date field
* ADA-324 add aria required to term name field
* Add key back to term facet template
* Improve aria labels for facets and item table
* ADA-311 remove title to avoid redundancy w/aria-labelledby
* Removing unneeded keys from v-if-else lines
* ADA-321 add note to clarify that the table acts as a form and saves changes automatically
* fix eslinting issues
* ADA-327 fix accessibility issues with term form fields
* ADA-321 Fix items term column in table to function properly
* ADA-332 fix table cell headers for stats page
* Change heading before table to a caption IN table to hopefully pass accessiblity checks
* ADA-331 add aria-label for term end date
* ADA-330 add aria-label for term start date
* ADA-329 add term name aria-label
* ADA-328 add aria-label for term default checkbox
* Removing trailing space eslint found
* ADA-322 make search box placeholder text darker gray
* ADA-313 remove highlight color from footer anchor tags to fix contrast ratio
* ADA-312 add aria label to Items pagination nav
* ADA-311 add aria-labelledby for Active column checkboxes
* ADA-310 Add aria label for copies column
* ADA-308 Status and Complete? had misnamed labels
* ADA 307: fix dev environment issues for iipsrv and vue hotloading

# 1.7.2 (2022-04-26)

Functional:
Expand Down