Skip to content
Open
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: 2 additions & 2 deletions .github/actions/build-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ runs:
fi

- name: Save Docker image as artifact
if: inputs.publish-image == 'false' && inputs.arch == 'amd64'
if: inputs.publish-image == 'false' && (inputs.arch == 'amd64' || inputs.type == 'fips')
shell: bash
env:
SERVICE: ${{ inputs.service }}
Expand All @@ -225,7 +225,7 @@ runs:
ls -lh /tmp/docker-images/

- name: Upload Docker image artifact
if: inputs.publish-image == 'false' && inputs.arch == 'amd64'
if: inputs.publish-image == 'false' && (inputs.arch == 'amd64' || inputs.type == 'fips')
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: docker-image-${{ inputs.service }}-${{ inputs.arch }}-${{ inputs.type }}
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ on:
default: false
required: false
type: boolean
arch:
default: amd64
required: false
type: string
shard:
default: '[1]'
required: false
Expand Down Expand Up @@ -70,13 +74,13 @@ env:
MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
TOOL_NODE_FLAGS: ${{ vars.TOOL_NODE_FLAGS }}
LOWERCASE_REPOSITORY: ${{ inputs.lowercase-repo }}
DOCKER_TAG: ${{ inputs.gh-docker-tag }}-amd64
DOCKER_TAG: ${{ inputs.gh-docker-tag }}-${{ inputs.arch }}

permissions: {}

jobs:
test:
runs-on: ubuntu-24.04
runs-on: ubuntu-24.04${{ inputs.arch == 'arm64' && '-arm' || '' }}
permissions:
actions: read
contents: read
Expand Down Expand Up @@ -143,7 +147,7 @@ jobs:
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
if: github.event.pull_request.head.repo.full_name != github.repository && github.event_name != 'release' && github.ref != 'refs/heads/develop'
with:
pattern: ${{ inputs.release == 'ce' && 'docker-image-rocketchat-amd64-coverage' || (inputs.fips && 'docker-image-*-amd64-fips' || 'docker-image-*-amd64-coverage') }}
pattern: ${{ inputs.release == 'ce' && format('docker-image-rocketchat-{0}-coverage', inputs.arch) || (inputs.fips && format('docker-image-*-{0}-fips', inputs.arch) || format('docker-image-*-{0}-coverage', inputs.arch)) }}
path: /tmp/docker-images
merge-multiple: true

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,6 @@ jobs:
type:
- ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}
- fips
exclude:
- arch: arm64
type: fips
include:
- arch: amd64
service: [rocketchat]
Expand Down Expand Up @@ -791,6 +788,7 @@ jobs:
type: api-livechat
release: ee
fips: true
arch: arm64
transporter: 'nats://nats:4222'
enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
mongodb-version: "['8.0']"
Expand Down
Loading