Skip to content
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
4 changes: 0 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.') }}
Expand All @@ -71,7 +70,6 @@ jobs:
echo "bump-part=major" >> "$GITHUB_OUTPUT"
fi


- name: Update package with new version
id: bump
run: |
Expand Down Expand Up @@ -113,8 +111,6 @@ jobs:
})
return response.data.body



- name: Create a release
uses: actions/github-script@v6.4.1
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-image/Dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-image/configs/.npmrc
Original file line number Diff line number Diff line change
@@ -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
Loading