Skip to content

Merging changes from main into staging #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Feb 19, 2025
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
22 changes: 7 additions & 15 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
# Trigger on push to main or tags matching v*
push:
branches:
- "dev"
- "main"
- "production"
- "staging"
Expand Down Expand Up @@ -54,6 +55,10 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
- name: Label dev
if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
run: |
echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
- name: Label production
if: github.event_name == 'push' && github.ref == 'refs/heads/production'
run: |
Expand Down Expand Up @@ -109,16 +114,7 @@ jobs:
# key: local-docker-directory

- name: Build AMD Image for production or main
if: env.RELEASE_VERSION == 'production' || env.RELEASE_VERSION == 'latest'
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
run: |
docker build . --file Dockerfile --platform=linux/amd64 --tag $DOCKERHUB_REGISTRY/$DOCKERHUB_USERNAME/$IMAGE_NAME:$RELEASE_VERSION --tag $GITHUB_REGISTRY/$DOCKERHUB_USERNAME/$IMAGE_NAME:$RELEASE_VERSION --tag $ECR_REGISTRY/kcworks:$RELEASE_VERSION
docker image ls

- name: Build AMD Image for staging
if: env.RELEASE_VERSION == 'staging'
if: env.RELEASE_VERSION == 'production' || env.RELEASE_VERSION == 'latest' || env.RELEASE_VERSION == 'dev' || env.RELEASE_VERSION == 'staging'
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
Expand All @@ -133,7 +129,7 @@ jobs:
docker push $DOCKERHUB_REGISTRY/$DOCKERHUB_USERNAME/$IMAGE_NAME --all-tags

- name: Push production or staging image to Amazon ECR
if: env.RELEASE_VERSION == 'production' || env.RELEASE_VERSION == 'staging'
if: env.RELEASE_VERSION == 'production' || env.RELEASE_VERSION == 'staging' || env.RELEASE_VERSION == 'dev'
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
Expand All @@ -146,10 +142,6 @@ jobs:
touch .env
docker compose --file docker-compose.yml --file docker-compose.dev.yml up -d

# - name: Run unit tests
# run: |
# docker exec -it kcworks-ui bash -c "cd /opt/invenio/src/site && PIPENV_DOTENV_LOCATION=/Users/ianscott/Development/knowledge-commons-works/site/tests/.env pipenv run python -m pytest"

- name: Destroy containers
if: always()
run: |
Expand Down
2 changes: 1 addition & 1 deletion docs/build/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: c98d14472b07a7a52cb283ce05317c0a
config: c534e3803c9cb7a80e2fd2d8105eeda9
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/build/.doctrees/README.doctree
Binary file not shown.
Binary file added docs/build/.doctrees/api.doctree
Binary file not shown.
Binary file added docs/build/.doctrees/architecture.doctree
Binary file not shown.
Binary file added docs/build/.doctrees/changelog.doctree
Binary file not shown.
Binary file modified docs/build/.doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/.doctrees/index.doctree
Binary file not shown.
Binary file modified docs/build/.doctrees/metadata.doctree
Binary file not shown.
20 changes: 11 additions & 9 deletions docs/build/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<head><meta charset="utf-8"/>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
<meta name="color-scheme" content="light dark"><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Installation" href="installation.html" /><link rel="prev" title="Welcome to Knowledge Commons Works’s documentation!" href="index.html" />
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Changes" href="changelog.html" /><link rel="prev" title="Welcome to the Knowledge Commons Works technical documentation!" href="index.html" />

<!-- Generated with Sphinx 7.3.7 and Furo 2024.08.06 -->
<title>About - Knowledge Commons Works 0.3.3 documentation</title>
<title>About - Knowledge Commons Works 0.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=8f2a1f02" />
<link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=354aac6f" />
<link rel="stylesheet" type="text/css" href="_static/styles/furo-extensions.css?v=302659d7" />
Expand Down Expand Up @@ -166,7 +166,7 @@
</label>
</div>
<div class="header-center">
<a href="index.html"><div class="brand">Knowledge Commons Works 0.3.3 documentation</div></a>
<a href="index.html"><div class="brand">Knowledge Commons Works 0.3.5 documentation</div></a>
</div>
<div class="header-right">
<div class="theme-toggle-container theme-toggle-header">
Expand All @@ -190,7 +190,7 @@
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">


<span class="sidebar-brand-text">Knowledge Commons Works 0.3.3 documentation</span>
<span class="sidebar-brand-text">Knowledge Commons Works 0.3.5 documentation</span>

</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
Expand All @@ -201,10 +201,12 @@
<p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
<ul class="current">
<li class="toctree-l1 current current-page"><a class="current reference internal" href="#">About</a></li>
<li class="toctree-l1"><a class="reference internal" href="changelog.html">Changes</a></li>
<li class="toctree-l1"><a class="reference internal" href="installation.html">Installation</a></li>
<li class="toctree-l1"><a class="reference internal" href="metadata.html">Metadata Schema and Vocabularies</a></li>
<li class="toctree-l1"><a class="reference internal" href="metadata.html">Metadata Schema, Vocabularies, and Identifiers</a></li>
<li class="toctree-l1"><a class="reference internal" href="customizations.html">Customizations to InvenioRDM</a></li>
<li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration of InvenioRDM</a></li>
<li class="toctree-l1"><a class="reference internal" href="api.html">API</a></li>
<li class="toctree-l1"><a class="reference internal" href="cli_commands.html">CLI Commands</a></li>
<li class="toctree-l1"><a class="reference internal" href="infrastructure.html">KCWorks Infrastructure</a></li>
<li class="toctree-l1"><a class="reference internal" href="developing.html">Developing KCWorks</a></li>
Expand Down Expand Up @@ -253,7 +255,7 @@
<section id="about">
<h1>About<a class="headerlink" href="#about" title="Link to this heading">¶</a></h1>
<p>Knowledge Commons Works is a collaborative tool for storing and sharing academic research. It is part of Knowledge Commons and is built on an instance of the InvenioRDM repository system.</p>
<p>Version 0.3.3-beta6</p>
<p>Version 0.3.5-beta8</p>
<section id="copyright">
<h2>Copyright<a class="headerlink" href="#copyright" title="Link to this heading">¶</a></h2>
<p>Copyright 2023-24 Mesh Research. Released under the MIT license. (See the included LICENSE.txt file.)</p>
Expand All @@ -265,12 +267,12 @@ <h2>Copyright<a class="headerlink" href="#copyright" title="Link to this heading
<footer>

<div class="related-pages">
<a class="next-page" href="installation.html">
<a class="next-page" href="changelog.html">
<div class="page-info">
<div class="context">
<span>Next</span>
</div>
<div class="title">Installation</div>
<div class="title">Changes</div>
</div>
<svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
</a>
Expand Down Expand Up @@ -328,7 +330,7 @@ <h2>Copyright<a class="headerlink" href="#copyright" title="Link to this heading

</aside>
</div>
</div><script src="_static/documentation_options.js?v=d5a15cff"></script>
</div><script src="_static/documentation_options.js?v=ba50482b"></script>
<script src="_static/doctools.js?v=9a2dae69"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="_static/scripts/furo.js?v=5fa4622c"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/build/_sources/README.md.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Knowledge Commons Works is a collaborative tool for storing and sharing academic research. It is part of Knowledge Commons and is built on an instance of the InvenioRDM repository system.

Version 0.3.3-beta6
Version 0.3.5-beta8

## Copyright

Expand Down
Loading
Loading