Browse Source

Merge branch 'master' into setuppage

pull/110/head
Sacha Weatherstone 3 years ago
committed by GitHub
parent
commit
54d853703e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 31
      .github/workflows/ci.yml
  2. 5
      Containerfile
  3. 3202
      pnpm-lock.yaml
  4. 2
      src/components/PageComponents/ModuleConfig/CannedMessage.tsx
  5. 2
      src/components/PageComponents/ModuleConfig/RangeTest.tsx
  6. 2
      src/components/PageComponents/ModuleConfig/StoreForward.tsx

31
.github/workflows/ci.yml

@ -2,6 +2,10 @@ name: CI
on: push
permissions:
contents: write
packages: write
jobs:
build-and-package:
runs-on: ubuntu-latest
@ -29,3 +33,30 @@ jobs:
prerelease: false
files: |
./dist/build.tar
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Buildah Build
id: build-container
uses: redhat-actions/[email protected]
with:
containerfiles: |
./Containerfile
image: ${{github.event.repository.full_name}}
tags: latest ${{ github.sha }}
oci: true
platforms: linux/amd64, linux/arm64
- name: Push To Registry
id: push-to-registry
uses: redhat-actions/[email protected]
with:
image: ${{ steps.build-container.outputs.image }}
tags: ${{ steps.build-container.outputs.tags }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Print image url
run: echo "Image pushed to ${{ steps.push-to-registry.outputs.registry-paths }}"

5
Containerfile

@ -0,0 +1,5 @@
FROM registry.access.redhat.com/ubi9/nginx-122:1-12
ADD dist .
CMD nginx -g "daemon off;"

3202
pnpm-lock.yaml

File diff suppressed because it is too large

2
src/components/PageComponents/ModuleConfig/CannedMessage.tsx

@ -39,7 +39,7 @@ export const CannedMessage = (): JSX.Element => {
return (
<DynamicForm<CannedMessageValidation>
onSubmit={onSubmit}
defaultValues={config.moduleConfig.mqtt}
defaultValues={moduleConfig.cannedMessage}
enableSwitch={enableSwitch}
fieldGroups={[
{

2
src/components/PageComponents/ModuleConfig/RangeTest.tsx

@ -39,7 +39,7 @@ export const RangeTest = (): JSX.Element => {
return (
<DynamicForm<RangeTestValidation>
onSubmit={onSubmit}
defaultValues={config.moduleConfig.rangeTest}
defaultValues={moduleConfig.rangeTest}
enableSwitch={enableSwitch}
fieldGroups={[
{

2
src/components/PageComponents/ModuleConfig/StoreForward.tsx

@ -38,7 +38,7 @@ export const StoreForward = (): JSX.Element => {
return (
<DynamicForm<StoreForwardValidation>
onSubmit={onSubmit}
defaultValues={config.moduleConfig.storeForward}
defaultValues={moduleConfig.storeForward}
enableSwitch={enableSwitch}
fieldGroups={[
{

Loading…
Cancel
Save