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

fix: Release 1.0.2 #76

Merged
merged 10 commits into from
Apr 5, 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
20 changes: 10 additions & 10 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:

#Build docker images
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3.2.0
- name: Login to GitHub Packages Docker Registry
uses: docker/login-action@v3.0.0
with:
Expand All @@ -55,7 +55,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta - frontend
id: docker_meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5.5.1
with:
images: ghcr.io/splunk/sc4snmp-ui/frontend/container
tags: |
Expand All @@ -76,9 +76,9 @@ jobs:
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-to: type=inline
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4.0.2
with:
node-version: "14"
node-version: "20.12.0"

build-backend:
name: build-backend
Expand All @@ -94,9 +94,9 @@ jobs:

#Build docker images
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3.2.0
- name: Login to GitHub Packages Docker Registry
uses: docker/login-action@v3.0.0
with:
Expand All @@ -105,7 +105,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta - backend
id: docker_meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5.5.1
with:
images: ghcr.io/splunk/sc4snmp-ui/backend/container
tags: |
Expand All @@ -126,6 +126,6 @@ jobs:
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-to: type=inline
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4.0.2
with:
node-version: "14"
node-version: "20.12.0"
4 changes: 2 additions & 2 deletions .github/workflows/ci-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ jobs:
strategy:
matrix:
node-version:
- 16
- 20.12.0
steps:
- uses: actions/checkout@v4
- name: Set Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.2
with:
node-version: ${{ matrix.node-version }}
- name: Run install
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/ci-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:

#Build docker images
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3.2.0
- name: Login to GitHub Packages Docker Registry
uses: docker/login-action@v3.0.0
with:
Expand All @@ -50,7 +50,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta - frontend
id: docker_meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5.5.1
with:
images: ghcr.io/splunk/sc4snmp-ui/frontend/container
tags: |
Expand All @@ -71,9 +71,9 @@ jobs:
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-to: type=inline
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4.0.2
with:
node-version: "14"
node-version: "20.12.0"

build-backend:
name: build-backend
Expand All @@ -89,9 +89,9 @@ jobs:

#Build docker images
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3.2.0
- name: Login to GitHub Packages Docker Registry
uses: docker/login-action@v3.0.0
with:
Expand All @@ -100,7 +100,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta - backend
id: docker_meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5.5.1
with:
images: ghcr.io/splunk/sc4snmp-ui/backend/container
tags: |
Expand All @@ -121,9 +121,9 @@ jobs:
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-to: type=inline
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4.0.2
with:
node-version: "14"
node-version: "20.12.0"
release:
name: Release
needs: [build-frontend, build-backend]
Expand All @@ -132,22 +132,22 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: false
persist-credentials: false
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4.0.2
with:
node-version: "14"
node-version: "20.12.0"
- name: Semantic Release
id: version
uses: cycjimmy/semantic-release-action@v4.0.0
uses: cycjimmy/semantic-release-action@v4.1.0
with:
semantic_version: 17
semantic_version: 21.1.1
extra_plugins: |
@semantic-release/exec
@semantic-release/git
@google/semantic-release-replace-plugin@1.2.0
semantic-release-replace-plugin@1.2.7
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_ADMIN }}

3 changes: 2 additions & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[
"@semantic-release/commit-analyzer",
[
"@google/semantic-release-replace-plugin",
"semantic-release-replace-plugin",
{
"replacements": [
{
Expand Down Expand Up @@ -84,3 +84,4 @@
["@semantic-release/github", { "assets": ["NOTICE"] }],
],
}

25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Changelog

## [1.0.2]

### Changed
- add CHANGELOG
- upgraded node version in github workflows to 20.12.0

### Upgraded github actions
- docker/setup-qemu-action to "3"
- docker/setup-buildx-action to "3.2.0"
- docker/metadata-action to "5.5.1"
- actions/setup-node to "4.0.2"
- actions/checkout to "4"
- cycjimmy/semantic-release-action to "4.1.0"
- semantic version to "21.1.1"
- semantic-release-replace-plugin to "1.2.7"

### upgraded devDependencies
- mongodb to "6.5.0"
- @splunk/babel-preset to "^4.0.0"
- enzyme-adapter-react-16 to "^1.15.8"
- node to "20.12.0"
- mongoose to "^8.3.0"
- lerna to "^8.1.2"
2 changes: 1 addition & 1 deletion backend/SC4SNMP_UI_backend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

load_dotenv()

__version__ = "1.0.2-beta.1"
__version__ = "1.0.2-beta.2"

MONGO_URI = os.getenv("MONGO_URI")
mongo_client = MongoClient(MONGO_URI)
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine as build-step
FROM node:20.12.0-alpine as build-step
WORKDIR /frontend
ENV PATH /frontend/node_modules/.bin:$PATH
COPY package.json yarn.lock lerna.json ./
Expand Down
4 changes: 2 additions & 2 deletions frontend/lerna.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"lerna": "^6.6.2",
"version": "1.0.2-beta.1",
"version": "1.0.2-beta.2",
"command": {
"publish": {
"ignoreChanges": ["*.md"]
}
},
"npmClient": "yarn",
"useWorkspaces": true
"packages": ["packages/*"]
}
8 changes: 4 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
"test": "lerna run test --stream --no-sort"
},
"devDependencies": {
"lerna": "^6.6.2",
"lerna": "^8.1.2",
"prettier": "^2.0.5"
},
"workspaces": [
"packages/*"
],
"engines": {
"node": ">=8"
"node": "20.12.0"
},
"dependencies": {
"cors": "^2.8.5",
"express": "^4.18.1",
"mongodb": "^5.8.0",
"mongoose": "^6.4.4"
"mongodb": "^6.5.0",
"mongoose": "^8.3.0"
}
}
10 changes: 5 additions & 5 deletions frontend/packages/manager/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@splunk/manager",
"version": "1.0.2-beta.1",
"version": "1.0.2-beta.2",
"license": "UNLICENSED",
"scripts": {
"build": "NODE_ENV=production webpack --bail --config demo/webpack.standalone.config.js",
Expand All @@ -25,7 +25,7 @@
"axios": "^1.6.8",
"css-loader": "^6.7.1",
"history": "5.3.0",
"mongodb": "^5.8.0",
"mongodb": "^6.5.0",
"qs": "6.11.2",
"react-router-dom": "6",
"scriptjs": "^2.5.9",
Expand All @@ -34,7 +34,7 @@
"devDependencies": {
"@babel/core": "^7.2.0",
"@jest/globals": "^29.6.1",
"@splunk/babel-preset": "^3.0.0",
"@splunk/babel-preset": "^4.0.0",
"@splunk/eslint-config": "^4.0.0",
"@splunk/splunk-utils": "^2.3.4",
"@splunk/stylelint-config": "^4.0.0",
Expand All @@ -48,7 +48,7 @@
"chai": "^3.5.0",
"css-loader": "^6.7.1",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-adapter-react-16": "^1.15.8",
"eslint": "^7.14.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^6.15.0",
Expand Down Expand Up @@ -77,6 +77,6 @@
"styled-components": "5.1.1"
},
"engines": {
"node": ">=6"
"node": "20.12.0"
}
}
Loading
Loading