Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-45728: Update github action to build for arm64 #5

Merged
merged 8 commits into from
Aug 14, 2024
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
37 changes: 13 additions & 24 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Build Jenkins swarm client container

Check warning on line 1 in .github/workflows/build.yaml

View workflow job for this annotation

GitHub Actions / call-workflow / yamllint

1:1 [document-start] missing document start "---"
on:
push:
branches:
- master
- main
pull_request:

env:
Expand All @@ -15,26 +15,15 @@
packages: write
contents: read
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Build swarm image
run: |
docker build . \
--build-arg JSWARM_UID=48435 \
--build-arg JSWARM_GID=202 \
--tag $CONTAINER_NAME \
--label "runnumber=${GITHUB_RUN_ID}"
- name: Log in to GitHub Container Registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

- name: Push images
run: |
CONTAINER_ID=ghcr.io/${{ github.repository_owner }}/$CONTAINER_NAME
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
[ "$VERSION" == "master" ] && VERSION=latest
echo CONTAINER_ID=$CONTAINER_ID
echo VERSION=$VERSION
docker tag $CONTAINER_NAME $CONTAINER_ID:$VERSION
docker push $CONTAINER_ID:$VERSION
- name: Checkout
uses: actions/checkout@v4
- name: Build and push
uses: lsst-dm/build-and-push@main
with:
platforms: linux/amd64,linux/arm64
github_token: ${{ secrets.GITHUB_TOKEN }}
push: true
build-args: |
JSWARM_UID=48435
JSWARM_GID=202
labels: runnumber=${{ github.run_id }}
11 changes: 11 additions & 0 deletions .github/workflows/markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Lint Markdown Files

Check warning on line 1 in .github/workflows/markdownlint.yaml

View workflow job for this annotation

GitHub Actions / call-workflow / yamllint

1:1 [document-start] missing document start "---"

on:
push:
branches:
- main
pull_request:

jobs:
call-workflow:
uses: lsst/rubin_workflows/.github/workflows/markdownlint.yaml@main
7 changes: 7 additions & 0 deletions .github/workflows/rebase_checker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: Check that 'main' is not merged into the development branch

Check warning on line 1 in .github/workflows/rebase_checker.yaml

View workflow job for this annotation

GitHub Actions / call-workflow / yamllint

1:1 [document-start] missing document start "---"

on: pull_request

jobs:
call-workflow:
uses: lsst/rubin_workflows/.github/workflows/rebase_checker.yaml@main
8 changes: 8 additions & 0 deletions .github/workflows/yamllint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: Lint YAML Files

Check warning on line 1 in .github/workflows/yamllint.yaml

View workflow job for this annotation

GitHub Actions / call-workflow / yamllint

1:1 [document-start] missing document start "---"

on:
pull_request:

jobs:
call-workflow:
uses: lsst/rubin_workflows/.github/workflows/yamllint.yaml@main
8 changes: 0 additions & 8 deletions .hadolint.yaml

This file was deleted.

32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
extends: default

Check warning on line 1 in .yamllint

View workflow job for this annotation

GitHub Actions / call-workflow / yamllint

1:1 [document-start] missing document start "---"
rules:
truthy:
check-keys: false
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# download swarm jar
#
FROM alpine:3 as downloader
FROM alpine:3 AS downloader

ARG JSWARM_VERSION=3.46
ARG JSWARM_JAR_NAME=swarm-client-${JSWARM_VERSION}.jar
Expand All @@ -19,7 +19,7 @@ RUN curl -sSLo /${JMXEX_JAR_NAME} ${JMXEX_URL}
#
# pkg base
#
FROM alpine:3 as pkg_base
FROM alpine:3 AS pkg_base

RUN apk add --no-cache --upgrade openjdk21 bash git docker make

Expand Down
11 changes: 0 additions & 11 deletions Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Usage
---

```sh
docker run -ti lsstsqre/jenkins-swarm-client
docker run -ti ghcr.io/lsst-dm/jenkins-swarm-client
```
28 changes: 0 additions & 28 deletions tests/hadolint.sh

This file was deleted.

31 changes: 0 additions & 31 deletions tests/make.sh

This file was deleted.

26 changes: 0 additions & 26 deletions tests/mdl.sh

This file was deleted.

26 changes: 0 additions & 26 deletions tests/shellcheck.sh

This file was deleted.

38 changes: 0 additions & 38 deletions tests/yamllint.sh

This file was deleted.

Loading