Update tags

UW-Macrostrat · Oct 16, 2024 · a465e92 · a465e92
1 parent c8d267d
commit a465e92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 44 deletions.
diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -4,49 +4,13 @@ on:
   push:
     branches: ["main"]
     tags:
-      - v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
+      - 'v*.*.*' # glob for semver tags (including prereleases)
   pull_request:
     branches: [main]
 
 jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: hub.opensciencegrid.org/macrostrat/web
-          # New: apply the 'latest' tag to non-prerelease semver tags
-          tags: |
-            type=raw,value=sha-{{sha}}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')}}
-            type=raw,value=latest-itb,enable=${{ startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-')}}
-            type=raw,value=latest-,suffix={{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')}}
-            type=raw,value=latest-itb-,suffix={{date 'YYYYMMDDHHmmss'}}
-            type=ref,event=pr
-            type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
-            type=semver,pattern={{version}}
-          flavor: |
-            latest=false
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
-      - name: Login to OSG DockerHub
-        uses: docker/login-action@v2
-        with:
-          registry: hub.opensciencegrid.org
-          username: ${{ vars.HARBOR_CLI_NAME }}
-          password: ${{ secrets.HARBOR_CLI_SECRET }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+  call-build-image:
+    uses: UW-Macrostrat/build-push/.github/workflows/build-push.yaml@main
+    secrets: inherit
+    with:
+      image: 'hub.opensciencegrid.org/macrostrat/web'
diff --git a/pages/maps/ingestion/@id/@editMode/+Page.ts b/pages/maps/ingestion/@id/@editMode/+Page.ts
@@ -62,6 +62,7 @@ export function Page() {
               {
                 title: source.name,
                 sourceURL: source.url,
+                ingestProcess,
               },
               [h(ShowMapButton, { showMap, setShowMap })]
             ),

diff --git a/pages/maps/ingestion/@id/meta/+Page.ts b/pages/maps/ingestion/@id/meta/+Page.ts
@@ -10,12 +10,14 @@ interface EditInterfaceMetaProps {
 }
 
 export function Page() {
-  const { source_id, source }: EditInterfaceMetaProps = usePageProps();
+  const { source_id, source, ingestProcess }: EditInterfaceMetaProps =
+    usePageProps();
   return h(ContentPage, { centered: true }, [
     h("div", {}, [
       h(Header, {
         title: source.name,
         sourceURL: source.url,
+        ingestProcess,
       }),
       h(EditSourceForm, { sourceId: source_id }),
     ]),

diff --git a/pages/maps/ingestion/components/ingest-tag-display.ts b/pages/maps/ingestion/components/ingest-tag-display.ts
@@ -46,7 +46,7 @@ export function IngestTagDisplay({
     onUpdate();
   }, []);
 
-  const { id, tags } = ingestProcess;
+  const { id, tags } = _ingestProcess;
 
   return h(
     "div.flex.row",