Skip to content

Commit 88ecf42

Browse files
committed
Change refrences from master to main
1 parent 1221f91 commit 88ecf42

File tree

8 files changed

+23
-26
lines changed

8 files changed

+23
-26
lines changed

.devcontainer/devcontainer.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"image": "ludeeus/container:frontend",
55
"context": "..",
66
"appPort": ["5000:5000"],
7-
"postCreateCommand": "make init",
8-
"runArgs": [
9-
"-v",
10-
"${env:HOME}${env:USERPROFILE}/.ssh:/tmp/.ssh"
11-
],
7+
"postCreateCommand": "apk add make && make init",
8+
"runArgs": ["-v", "${env:HOME}${env:USERPROFILE}/.ssh:/tmp/.ssh"],
129
"extensions": [
1310
"github.vscode-pull-request-github",
1411
"tabnine.tabnine-vscode",

.github/workflows/ReleaseActions.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
- name: "Set version number"
4545
run: |
4646
export version=${{ github.ref }}
47-
sed -i "s|master|${version##*/}|" ./setup.py
48-
sed -i "s|master|${version##*/}|" ./hacs_frontend/version.py
49-
sed -i "s|master|${version##*/}|" ./src/version.ts
47+
sed -i "s|main|${version##*/}|" ./setup.py
48+
sed -i "s|main|${version##*/}|" ./hacs_frontend/version.py
49+
sed -i "s|main|${version##*/}|" ./src/version.ts
5050
5151
cat ./setup.py
5252
cat ./hacs_frontend/version.py
@@ -56,10 +56,10 @@ jobs:
5656
run: |
5757
python -m pip install --upgrade pip
5858
pip install setuptools wheel twine
59-
script/bootstrap
59+
make bootstrap
6060
6161
- name: Build
62-
run: script/build
62+
run: make build
6363

6464
- name: Publish to PyPi
6565
env:

.github/workflows/TestBuild.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: "Test build"
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
build_frontend:

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ bootstrap: ## Run yarn
1616
build: ## Build the frontend
1717
yarn build;
1818

19-
update: ## Pull master from hacs/frontend
20-
git pull upstream master;
19+
update: ## Pull main from hacs/frontend
20+
git pull upstream main;
2121

2222
update-submodule: ## Udpate submodules
2323
rm -R homeassistant-frontend;

hacs_frontend/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION="master"
1+
VERSION="main"

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name="hacs-frontend",
5-
version="master",
5+
version="main",
66
description="The HACS frontend",
77
url="https://github.com/hacs/frontend",
88
author="Joakim Sorensen",

src/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const version = "master";
1+
export const version = "main";

yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -1900,9 +1900,9 @@
19001900
integrity sha512-jWeYcTo3sCH/rMgsdYXDTO85GNRyTCII5dayMIu/ZO4zbEot1E3iNGaOwpLReLUHjeNQFkgeNNVYlY4dX6azQQ==
19011901

19021902
"@types/node@*":
1903-
version "14.0.26"
1904-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.26.tgz#22a3b8a46510da8944b67bfc27df02c34a35331c"
1905-
integrity sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA==
1903+
version "14.0.27"
1904+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
1905+
integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
19061906

19071907
"@types/resize-observer-browser@^0.1.3":
19081908
version "0.1.3"
@@ -3319,9 +3319,9 @@ each-props@^1.3.0:
33193319
object.defaults "^1.1.0"
33203320

33213321
electron-to-chromium@^1.3.488:
3322-
version "1.3.510"
3323-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.510.tgz#dee781ff8b595c0deb60172b75d50b6889757eda"
3324-
integrity sha512-sLtGB0znXdmo6lM8hy5wTVo+fLqvIuO8hEpgc0DvPmFZqvBu/WB7AarEwhxVKjf3rVbws/rC8Xf+AlsOb36lJQ==
3322+
version "1.3.512"
3323+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.512.tgz#620e6731c693ddaaf3750f23dde7f7c4347b7327"
3324+
integrity sha512-y02hdFg7c4jTfREcXf4fRhHLt7BzofMgd7JAKY+u9i62E0D1eIpLQPFo5/eboZL0bIVY9YHZA53+vCGNFREOXA==
33253325

33263326
elliptic@^6.0.0, elliptic@^6.5.2:
33273327
version "6.5.3"
@@ -3590,9 +3590,9 @@ eslint-plugin-react-hooks@^4:
35903590
integrity sha512-6SSb5AiMCPd8FDJrzah+Z4F44P2CdOaK026cXFV+o/xSRzfOiV1FNFeLl2z6xm3yqWOQEZ5OfVgiec90qV2xrQ==
35913591

35923592
eslint-plugin-react@^7.20.0:
3593-
version "7.20.4"
3594-
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.4.tgz#c14d2631221ec694ddd84557d7152f44b66e4aa0"
3595-
integrity sha512-y4DOQ0LrzuDQFEAnYFGjJMRHQQqfTco02qiWI00eGQYikHTzC15S5aRHGWSffnThv8sBpsmFBLky3K5keniAJg==
3593+
version "7.20.5"
3594+
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz#29480f3071f64a04b2c3d99d9b460ce0f76fb857"
3595+
integrity sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==
35963596
dependencies:
35973597
array-includes "^3.1.1"
35983598
array.prototype.flatmap "^1.2.3"

0 commit comments

Comments
 (0)