Merge pull request #3 from alercebroker/dev/update-apf-1.0.7

Update APF to version 1.0.7
alercebroker · Jun 9, 2022 · d8b4871 · d8b4871
2 parents 585b0f6 + 29f7639
commit d8b4871
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 38 deletions.
diff --git a/.github/workflows/build_image.yml → .github/workflows/build.yml b/.github/workflows/build_image.yml → .github/workflows/build.yml
@@ -1,29 +1,20 @@
 name: build_image
 on:
-  release:
-    types:
-      - published
-      - edited
+  workflow_call:
+    inputs:
+      tags:
+        required: true
+        type: string
+    secrets:
+      PUBLISH_IMAGE_TOKEN:
+        required: true
 jobs:
-  push_to_registry:
+  build_and_push:
     name: Push Docker image to GitHub Packages
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=ghcr.io/alercebroker/feature_step
-          VERSION=latest
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
-          fi
-          echo ::set-output name=tags::${TAGS}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -40,4 +31,4 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ steps.prep.outputs.tags }}
+          tags: ${{ inputs.tags }}
diff --git a/.github/workflows/build_production.yml b/.github/workflows/build_production.yml
@@ -0,0 +1,34 @@
+name: build_production_image
+on:
+  release:
+    types:
+      - published
+      - edited
+jobs:
+  get_tags:
+    runs-on: ubuntu-latest
+    outputs:
+      tags: ${{ steps.prep.outputs.tags }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=ghcr.io/alercebroker/feature_step
+          VERSION=latest
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+          fi
+          echo ::set-output name=tags::${TAGS}
+  push_image:
+    needs: get_tags
+    uses: ./.github/workflows/build.yml
+    with:
+      tags: ${{ needs.get_tags.outputs.tags }}
+    secrets:
+      PUBLISH_IMAGE_TOKEN: ${{ secrets.PUBLISH_IMAGE_TOKEN }}
diff --git a/.github/workflows/build_staging.yml b/.github/workflows/build_staging.yml
@@ -0,0 +1,35 @@
+name: build_staging_image
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  get_tags:
+    runs-on: ubuntu-latest
+    outputs:
+      tags: ${{ steps.prep.outputs.tags }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=ghcr.io/alercebroker/feature_step
+          SHA=$(git rev-parse --short HEAD)
+          VERSION=rc-$SHA
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:rc"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:rc-$SHA"
+          fi
+          echo ::set-output name=tags::${TAGS}
+  push_image:
+    needs: get_tags
+    uses: ./.github/workflows/build.yml
+    with:
+      tags: ${{ needs.get_tags.outputs.tags }}
+    secrets:
+      PUBLISH_IMAGE_TOKEN: ${{ secrets.PUBLISH_IMAGE_TOKEN }}
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -1,9 +1,6 @@
 name: integration_test
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
     branches:
       - main
@@ -12,16 +9,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8]
-
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.7
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -1,9 +1,6 @@
 name: unittest
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
     branches:
       - main
@@ -12,16 +9,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8]
-
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.7
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 numpy>=1.16.0
 matplotlib
 GPy
-apf-base==1.0.3
+apf-base==1.0.7
 -e git+https://github.com/alercebroker/mhps.git#egg=mhps
 -e git+https://github.com/alercebroker/turbo-fats.git#egg=turbofats
 -e git+https://github.com/alercebroker/db-plugins.git#egg=db_plugins