From a57bc14fe45e935c35294433d63bb0ddca839bbe Mon Sep 17 00:00:00 2001 From: Samuel Hassine Date: Sun, 22 Oct 2023 15:27:58 +0200 Subject: [PATCH] [integration] Upload packages to artifactory --- .circleci/config.yml | 11 +++-------- .../components/workspaces/dashboards/Dashboard.jsx | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb15b877f3a73..621fea1d83098 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,11 +102,7 @@ jobs: steps: - attach_workspace: at: ~/ - - add_ssh_keys - run: sudo apt-get update -qq && sudo apt install curl - - run: ssh-keyscan -H opencti.io >> ~/.ssh/known_hosts - - run: git config --global user.email "ci@opencti.io" && git config --global user.name "OpenCTI CircleCI" - - run: git remote add opencti ssh://git-OLOszi5F@opencti.io:/~/git-OLOszi5F.git && git push --force opencti master - run: mkdir release - run: rm -Rf ./opencti-platform/opencti-graphql/.yarn/cache - run: cp -a ./opencti-platform/opencti-graphql release/opencti @@ -118,7 +114,7 @@ jobs: command: tar -zcvf "opencti-$(date '+%Y%m%d').tar.gz" opencti - run: working_directory: ~/opencti/release - command: scp "opencti-$(date '+%Y%m%d').tar.gz" git-OLOszi5F@opencti.io:/dns/io/opencti/releases/ + command: curl -usamuel.hassine@gmail.com:$JFROG_TOKEN -T opencti-$(date '+%Y%m%d').tar.gz "https://filigran.jfrog.io/artifactory/opencti/opencti-$(date '+%Y%m%d').tar.gz" - slack/notify: event: fail template: basic_fail_1 @@ -135,8 +131,7 @@ jobs: - attach_workspace: at: ~/ - add_ssh_keys - - run: sudo apt-get update -qq && sudo apt install curl - - run: ssh-keyscan -H opencti.io >> ~/.ssh/known_hosts + - run: sudo apt-get update -qq && sudo apt install curl - run: mkdir release - run: rm -Rf ./opencti-platform/opencti-graphql/.yarn/cache - run: cp -a ./opencti-platform/opencti-graphql release/opencti @@ -148,7 +143,7 @@ jobs: command: tar -zcvf "opencti-$(date '+%Y%m%d')_musl.tar.gz" opencti - run: working_directory: ~/opencti_musl/release - command: scp "opencti-$(date '+%Y%m%d')_musl.tar.gz" git-OLOszi5F@opencti.io:/dns/io/opencti/releases/ + command: curl -usamuel.hassine@gmail.com:$JFROG_TOKEN -T opencti-$(date '+%Y%m%d').tar.gz "https://filigran.jfrog.io/artifactory/opencti/opencti-$(date '+%Y%m%d').tar.gz" - slack/notify: event: fail template: basic_fail_1 diff --git a/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/Dashboard.jsx b/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/Dashboard.jsx index a3bf6bb46a6e0..5e13c0b65d766 100644 --- a/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/Dashboard.jsx +++ b/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/Dashboard.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState, useMemo } from 'react'; +import React, { useState, useMemo } from 'react'; import * as R from 'ramda'; import { createFragmentContainer, graphql } from 'react-relay'; import RGL, { WidthProvider } from 'react-grid-layout';