Skip to content

Commit 0a513e1

Browse files
committed
Separate github_username for emoncms_src and symodules
nota : all legacy modules are fetched from the emoncms account
1 parent d23c7dd commit 0a513e1

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

.github/workflows/emoncms.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ on:
88
required: true
99
type: string
1010
default: 'emoncms'
11-
github_username:
12-
description: 'github username for emoncms src and symlinked modules'
11+
github_username_emoncms:
12+
description: 'github username for emoncms src'
13+
required: true
14+
type: string
15+
default: 'emoncms'
16+
github_username_symodules:
17+
description: 'github username for symlinked modules'
1318
required: true
1419
type: string
1520
default: 'emoncms'
@@ -83,8 +88,8 @@ jobs:
8388
"MODULES=${{ inputs.modules }}"
8489
"SYMODULES=${{ inputs.symodules }}"
8590
"SECONDOS=${{ inputs.workers }}"
86-
"EMONCMS_SRC=https://github.com/${{ inputs.github_username }}/emoncms"
87-
"SYMLINKED_MODULES_URL=https://github.com/${{ inputs.github_username }}"
91+
"EMONCMS_SRC=https://github.com/${{ inputs.github_username_emoncms }}/emoncms"
92+
"SYMLINKED_MODULES_URL=https://github.com/${{ inputs.github_username_symodules }}"
8893
"BRANCH=${{ inputs.branch }}"
8994
"BUILD_FROM=alpine:${{ inputs.alpine_version }}"
9095
"PHP_VER=${{ inputs.php_version }}"

.github/workflows/emoncms_w_version.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ on:
88
required: true
99
type: string
1010
default: 'emoncms'
11-
github_username:
12-
description: 'github username for emoncms src and symlinked modules'
11+
github_username_emoncms:
12+
description: 'github username for emoncms src'
13+
required: true
14+
type: string
15+
default: 'emoncms'
16+
github_username_symodules:
17+
description: 'github username for symlinked modules'
1318
required: true
1419
type: string
1520
default: 'emoncms'
@@ -67,7 +72,7 @@ jobs:
6772
- id: emoncms_version
6873
name: get emoncms version
6974
run: |
70-
wget https://raw.githubusercontent.com/${{ inputs.github_username }}/emoncms/${{ inputs.branch }}/version.json
75+
wget https://raw.githubusercontent.com/${{ inputs.github_username_emoncms }}/emoncms/${{ inputs.branch }}/version.json
7176
version=$(cat version.json | jq --raw-output '.version')
7277
echo $version
7378
echo "version=$version" >> "$GITHUB_OUTPUT"
@@ -80,8 +85,8 @@ jobs:
8085
"MODULES=${{ inputs.modules }}"
8186
"SYMODULES=${{ inputs.symodules }}"
8287
"SECONDOS=${{ inputs.workers }}"
83-
"EMONCMS_SRC=https://github.com/${{ inputs.github_username }}/emoncms"
84-
"SYMLINKED_MODULES_URL=https://github.com/${{ inputs.github_username }}"
88+
"EMONCMS_SRC=https://github.com/${{ inputs.github_username_emoncms }}/emoncms"
89+
"SYMLINKED_MODULES_URL=https://github.com/${{ inputs.github_username_symodules }}"
8590
"BRANCH=${{ inputs.branch }}"
8691
"BUILD_FROM=alpine:${{ inputs.alpine_version }}"
8792
"PHP_VER=${{ inputs.php_version }}"

0 commit comments

Comments
 (0)