Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Merge pull request #9539 from product-os/joshbwlng/remove-syncing
Browse files Browse the repository at this point in the history
Remove syncing
  • Loading branch information
flowzone-app[bot] authored Dec 18, 2023
2 parents e27964a + ac5e392 commit fb26ccd
Show file tree
Hide file tree
Showing 7 changed files with 123 additions and 2,407 deletions.
4 changes: 0 additions & 4 deletions .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ runs:
device_id="$(balena device "${balena_device_uuid}" | grep ^ID: | cut -c20-)"
# the actual version deployed depends on the AWS EC2/AMI, defined in AWS_EC2_LAUNCH_TEMPLATE
echo "=== here-1"
os_version="$(balena os versions ${{ inputs.DEVICE_TYPE }} \
| grep '${{ inputs.VARIANT }}' | head -n 1 | sed 's/.${{ inputs.VARIANT }}//g')"
Expand Down Expand Up @@ -521,14 +520,12 @@ runs:
balena login --token '${{ fromJSON(inputs.secrets).BALENA_API_KEY_PUSH }}'
echo "=== here-2"
if ! [[ -e "${HOME}/.ssh/id_rsa" ]]; then
ssh-keygen -N '' \
-C "$(balena whoami | grep EMAIL | cut -c11-)" \
-f "${HOME}/.ssh/id_rsa"
fi
echo "=== here-3"
match=''
for key in $(balena keys | grep -v ID | awk '{print $1}'); do
fp=$(balena key ${key} | tail -n 1 | ssh-keygen -E md5 -lf /dev/stdin | awk '{print $2}')
Expand All @@ -537,7 +534,6 @@ runs:
break
fi
done
echo "=== here-4"
if [[ -z $match ]]; then
balena key add "${GITHUB_SHA}" "${HOME}/.ssh/id_rsa.pub"
Expand Down
9 changes: 1 addition & 8 deletions apps/server/lib/plugins.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import { balenaApiPlugin } from '@balena/jellyfish-plugin-balena-api';
import { discoursePlugin } from '@balena/jellyfish-plugin-discourse';
import { frontPlugin } from '@balena/jellyfish-plugin-front';
import { githubPlugin } from '@balena/jellyfish-plugin-github';
import { PluginDefinition } from '@balena/jellyfish-worker';

export function getPlugins(): PluginDefinition[] {
return [
githubPlugin(),
discoursePlugin(),
frontPlugin(),
balenaApiPlugin(),
] as any;
return [githubPlugin(), discoursePlugin()] as any;
}
1 change: 0 additions & 1 deletion apps/server/nodemon.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"node_modules/@balena/jellyfish-logger/build/**/*.js",
"node_modules/@balena/jellyfish-plugin-discourse/build/**/*.js",
"node_modules/@balena/jellyfish-plugin-github/build/**/*.js",
"node_modules/@balena/jellyfish-plugin-front/build/**/*.js",
"node_modules/@balena/jellyfish-worker/build/**/*.js",
"node_modules/autumndb/build/**/*.js"
],
Expand Down
Loading

0 comments on commit fb26ccd

Please sign in to comment.