ci(semver): add scope to versioning (#3)

Cytomine-ULiege · Oct 25, 2024 · 4bbf79a · 4bbf79a
1 parent 3ff96c4
commit 4bbf79a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Release check
         id: release
         run: |
-          if [[ ${{ github.ref_name }} =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+          if [[ ${{ github.ref_name }} =~ ^bp-(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
             echo "release=true" >> $GITHUB_OUTPUT
           else
             echo "release=false" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/test-pims.yml b/.github/workflows/test-pims.yml
@@ -98,7 +98,7 @@ jobs:
               github.rest.packages.deletePackageForOrg({
                 org: context.repo.owner,
                 package_type: "container",
-                package_name: "pims",
+                package_name: "${{ github.event.repository.name }}",
               });
             } catch (error) {
               core.setFailed(error.message);

diff --git a/docker/backend.dockerfile b/docker/backend.dockerfile
@@ -132,8 +132,8 @@ ARG GUNICORN_VERSION=20.1.0
 ARG SETUPTOOLS_VERSION=59.6.0
 COPY ./requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir gunicorn==${GUNICORN_VERSION} && \
-    pip install --no-cache-dir -r requirements.txt && \
     pip install --no-cache-dir setuptools==${SETUPTOOLS_VERSION} && \
+    pip install --no-cache-dir -r requirements.txt && \
     python plugins.py \
    --plugin_csv /app/plugins.csv \
    --install_path ${PLUGIN_INSTALL_PATH} \
@@ -142,7 +142,7 @@ RUN pip install --no-cache-dir gunicorn==${GUNICORN_VERSION} && \
 
 # Add default config
 COPY ./pims-config.env /app/pims-config.env
-COPY ./logging-prod.yml /app/logging.yml
+COPY ./logging-prod.yml /app/logging-prod.yml
 COPY ./docker/gunicorn_conf.py /app/gunicorn_conf.py
 
 COPY ./docker/start.sh /start.sh