Skip to content

Commit 226cc5b

Browse files
authored
Update deployment process
1 parent dd09f1e commit 226cc5b

File tree

1 file changed

+23
-86
lines changed

1 file changed

+23
-86
lines changed
+23-86
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Build and deploy
22

3+
permissions:
4+
id-token: write # Require write permission to Fetch an OIDC token.
5+
36
on:
47
push:
58
branches: [ master ]
@@ -17,14 +20,14 @@ jobs:
1720

1821
steps:
1922
- name: Checkout repository
20-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2124

22-
- name: Setup Node.js ${{ matrix.node-version }}
25+
- name: Set up Node.js ${{ matrix.node-version }}
2326
uses: actions/setup-node@v3
2427
with:
2528
node-version: ${{ matrix.node-version }}
2629

27-
- name: Setup cache for NPM modules
30+
- name: Set up cache for NPM modules
2831
uses: actions/cache@v3
2932
with:
3033
path: ~/.npm
@@ -43,89 +46,23 @@ jobs:
4346
- name: Prune dependencies
4447
run: npm prune --production
4548

46-
- name: Upload new binaries
47-
uses: urielsalis/rsync-deploy@master
48-
env:
49-
DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
50-
SERVER_PORT: 50022
51-
FOLDER: "bin"
52-
ARGS: "-avhW --delete"
53-
SERVER_IP: localhost
54-
USERNAME: ${{ secrets.REMOTE_USER }}
55-
SERVER_DESTINATION: /home/mojiradiscordbot/mojira-discord-bot
56-
CLIENT_ID: ${{ secrets.CLIENT_ID }}
57-
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
58-
RESOURCE_ID: ${{ secrets.RESOURCE_ID }}
59-
RESOURCE_GROUP: ${{ secrets.RESOURCE_GROUP }}
60-
TENANT_ID: ${{ secrets.TENANT_ID }}
61-
BASTION_NAME: ${{ secrets.BASTION_NAME }}
62-
63-
- name: Upload new dependencies
64-
uses: urielsalis/rsync-deploy@master
65-
env:
66-
DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
67-
SERVER_PORT: 50022
68-
FOLDER: "node_modules"
69-
ARGS: "-avhW --delete"
70-
SERVER_IP: localhost
71-
USERNAME: ${{ secrets.REMOTE_USER }}
72-
SERVER_DESTINATION: /home/mojiradiscordbot/mojira-discord-bot
73-
CLIENT_ID: ${{ secrets.CLIENT_ID }}
74-
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
75-
RESOURCE_ID: ${{ secrets.RESOURCE_ID }}
76-
RESOURCE_GROUP: ${{ secrets.RESOURCE_GROUP }}
77-
TENANT_ID: ${{ secrets.TENANT_ID }}
78-
BASTION_NAME: ${{ secrets.BASTION_NAME }}
79-
80-
- name: Update config
81-
uses: urielsalis/rsync-deploy@master
82-
env:
83-
DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
84-
SERVER_PORT: 50022
85-
FOLDER: "config"
86-
ARGS: "-avhW --delete --exclude='local.yml' --exclude='local-*.yml'"
87-
SERVER_IP: localhost
88-
USERNAME: ${{ secrets.REMOTE_USER }}
89-
SERVER_DESTINATION: /home/mojiradiscordbot/mojira-discord-bot
90-
CLIENT_ID: ${{ secrets.CLIENT_ID }}
91-
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
92-
RESOURCE_ID: ${{ secrets.RESOURCE_ID }}
93-
RESOURCE_GROUP: ${{ secrets.RESOURCE_GROUP }}
94-
TENANT_ID: ${{ secrets.TENANT_ID }}
95-
BASTION_NAME: ${{ secrets.BASTION_NAME }}
96-
97-
- name: Update shell files
98-
uses: urielsalis/rsync-deploy@master
99-
env:
100-
DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
101-
SERVER_PORT: 50022
102-
FOLDER: "*.sh"
103-
ARGS: "-avhW"
104-
SERVER_IP: localhost
105-
USERNAME: ${{ secrets.REMOTE_USER }}
106-
SERVER_DESTINATION: /home/mojiradiscordbot/mojira-discord-bot
107-
CLIENT_ID: ${{ secrets.CLIENT_ID }}
108-
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
109-
RESOURCE_ID: ${{ secrets.RESOURCE_ID }}
110-
RESOURCE_GROUP: ${{ secrets.RESOURCE_GROUP }}
111-
TENANT_ID: ${{ secrets.TENANT_ID }}
112-
BASTION_NAME: ${{ secrets.BASTION_NAME }}
113-
114-
- name: Run internal deploy script
115-
uses: urielsalis/azure-bastion-ssh-action@master
116-
env:
117-
CLIENT_ID: ${{ secrets.CLIENT_ID }}
118-
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
119-
RESOURCE_ID: ${{ secrets.RESOURCE_ID }}
120-
RESOURCE_GROUP: ${{ secrets.RESOURCE_GROUP }}
121-
TENANT_ID: ${{ secrets.TENANT_ID }}
122-
BASTION_NAME: ${{ secrets.BASTION_NAME }}
49+
- name: Deploy
50+
uses: mojira/deploy@main
12351
with:
124-
host: localhost
125-
port: 50022
126-
user: ${{ secrets.REMOTE_USER }}
127-
key: ${{ secrets.SSH_PRIVATE_KEY }}
128-
command: |
52+
azure_client_id: ${{ secrets.AZURE_CLIENT_ID }}
53+
azure_tenant_id: ${{ secrets.AZURE_TENANT_ID }}
54+
azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
55+
bastion_name: ${{ secrets.BASTION_NAME }}
56+
resource_group: ${{ secrets.RESOURCE_GROUP }}
57+
resource_id: ${{ secrets.RESOURCE_ID }}
58+
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
59+
username: mojiradiscordbot
60+
artifact_paths: |
61+
bin
62+
node_modules
63+
config
64+
*.sh
65+
artifact_destination: /home/mojiradiscordbot/mojira-discord-bot
66+
script: |
12967
cd mojira-discord-bot
13068
./restart.sh main
131-
args: "-tt"

0 commit comments

Comments
 (0)