diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2f3e239..458309fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,6 @@ jobs: echo "base-tag=$(git describe | awk -F '-' '{print $1}')" >> "$GITHUB_OUTPUT" echo "full-tag=$(git describe)" >> "$GITHUB_OUTPUT" - - name: get first tag in current development iteration according to base id: fetch-tag if: ${{ contains(steps.last-release.outputs.full-tag , '-ea.') }} @@ -71,7 +70,6 @@ jobs: echo "bump-part=major" >> "$GITHUB_OUTPUT" fi - - name: Update package with new version id: bump run: | @@ -113,8 +111,6 @@ jobs: }) return response.data.body - - - name: Create a release uses: actions/github-script@v6.4.1 with: diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index 1e6c77d7..9031011f 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -147,6 +147,7 @@ jobs: ${{ env.DOCKERFILE_PATH }} build-args: | PACKAGE_REGISTRY_ACCESS_TOKEN=${{ secrets.PACKAGE_REGISTRY_ACCESS_TOKEN }} + EXHORT_JAVASCRIPT_API_VERSION=${{ steps.bump.outputs.version }} context: docker-image - name: Push Image To Registry diff --git a/docker-image/Dockerfiles/Dockerfile b/docker-image/Dockerfiles/Dockerfile index 6ebbde9a..360471e2 100644 --- a/docker-image/Dockerfiles/Dockerfile +++ b/docker-image/Dockerfiles/Dockerfile @@ -6,6 +6,7 @@ USER root # assign token for reading packages from github package registry ARG PACKAGE_REGISTRY_ACCESS_TOKEN='' +ARG EXHORT_JAVASCRIPT_API_VERSION='0.1.1-ea.55' # install Java RUN curl -kL https://download.oracle.com/java/21/archive/jdk-21.0.1_linux-x64_bin.tar.gz -o /tmp/java-package.tar.gz \ @@ -27,8 +28,7 @@ COPY configs/.npmrc . # replace placeholder with the actual environment variable RUN sed -i "s/__PACKAGE_REGISTRY_ACCESS_TOKEN__/${PACKAGE_REGISTRY_ACCESS_TOKEN}/g" ./.npmrc # install Exhort javascript API -# this still needs to reference RHEcosystemAppEng as packages dont seem to be redirected given the org change of the repo -RUN npm install --global @RHEcosystemAppEng/exhort-javascript-api@0.1.1-ea.26 +RUN npm install --global @trustification/exhort-javascript-api@${EXHORT_JAVASCRIPT_API_VERSION} # add RHDA script COPY scripts/rhda.sh /rhda.sh diff --git a/docker-image/configs/.npmrc b/docker-image/configs/.npmrc index e7e2252b..6a001f2e 100644 --- a/docker-image/configs/.npmrc +++ b/docker-image/configs/.npmrc @@ -1,2 +1,2 @@ //npm.pkg.github.com/:_authToken=__PACKAGE_REGISTRY_ACCESS_TOKEN__ -@RHEcosystemAppEng:registry=https://npm.pkg.github.com +@trustification:registry=https://npm.pkg.github.com