Skip to content

Commit ac95be1

Browse files
puzza007puzza007
authored
Merge pull request #15 from NarrativeApp/fix/dont-replace-underscores-in-service-name-with-hyphens
fix: don't replace underscores in service_name with hyphens
2 parents 6134a88 + f9941ef commit ac95be1

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎.github/workflows/private-elixir-library-w-git-ops.yml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,173 +3,173 @@ on: push
33
name: Privately published Elixir Library (with git ops)
44

55
env:
6-
ELIXIR_VERSION: "1.9"
7-
OTP_VERSION: "22.2"
6+
ELIXIR_VERSION: "1.12.3"
7+
OTP_VERSION: "24.3.3"
88

99
jobs:
1010
deps:
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-20.04
1212
env:
1313
NARRATIVE_HEX_ORG_API_KEY: ${{ secrets.NARRATIVE_HEX_ORG_API_KEY }}
1414
MIX_ENV: test
1515
steps:
1616
- name: Checking out project
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- name: "Setting up Elixir"
19-
uses: actions/setup-elixir@v1
19+
uses: erlef/setup-beam@v1
2020
with:
2121
otp-version: ${{ env.OTP_VERSION }}
2222
elixir-version: ${{ env.ELIXIR_VERSION }}
2323
- name: Signing into narrativeapp organisation on hex
2424
run: mix hex.organization auth narrativeapp --key $NARRATIVE_HEX_ORG_API_KEY
2525
- name: Downloading dependency cache
26-
uses: actions/cache@v2
26+
uses: actions/cache@v4
2727
with:
2828
path: deps
2929
key: ${{ runner.os }}-deps
3030
- run: mix deps.get
3131
- name: Uploading dependencies for other jobs
32-
uses: actions/upload-artifact@v2
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: deps
3535
path: deps/
3636

3737
build:
38-
runs-on: ubuntu-18.04
38+
runs-on: ubuntu-20.04
3939
needs: ["deps"]
4040
env:
4141
MIX_ENV: test
4242
steps:
4343
- name: Checking out project
44-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
4545
- name: "Setting up Elixir"
46-
uses: actions/setup-elixir@v1
46+
uses: erlef/setup-beam@v1
4747
with:
4848
otp-version: ${{ env.OTP_VERSION }}
4949
elixir-version: ${{ env.ELIXIR_VERSION }}
5050
- name: Downloading dependencies
51-
uses: actions/download-artifact@v2
51+
uses: actions/download-artifact@v4
5252
with:
5353
name: deps
5454
path: deps/
5555
- name: Downloading build artifact cache
56-
uses: actions/cache@v2
56+
uses: actions/cache@v4
5757
with:
5858
path: _build
5959
key: ${{ runner.os }}-build
6060
- name: Run `mix compile`
6161
run: mix compile
6262
- name: Uploading build artifacts for other jobs
63-
uses: actions/upload-artifact@v2
63+
uses: actions/upload-artifact@v4
6464
with:
6565
name: build
6666
path: _build/
6767

6868
credo:
69-
runs-on: ubuntu-18.04
69+
runs-on: ubuntu-20.04
7070
needs: ["deps", "build"]
7171
env:
7272
MIX_ENV: test
7373
steps:
7474
- name: Checking out project
75-
uses: actions/checkout@v2
75+
uses: actions/checkout@v4
7676
- name: "Setting up Elixir"
77-
uses: actions/setup-elixir@v1
77+
uses: erlef/setup-beam@v1
7878
with:
7979
otp-version: ${{ env.OTP_VERSION }}
8080
elixir-version: ${{ env.ELIXIR_VERSION }}
8181
- name: Downloading dependencies
82-
uses: actions/download-artifact@v2
82+
uses: actions/download-artifact@v4
8383
with:
8484
name: deps
8585
path: deps/
8686
- name: Downloading build artifacts
87-
uses: actions/download-artifact@v2
87+
uses: actions/download-artifact@v4
8888
with:
8989
name: build
9090
path: _build/
9191
- run: mix credo --strict
9292

9393
formatter:
94-
runs-on: ubuntu-18.04
94+
runs-on: ubuntu-20.04
9595
steps:
9696
- name: Checking out project
97-
uses: actions/checkout@v2
97+
uses: actions/checkout@v4
9898
- name: "Setting up Elixir"
99-
uses: actions/setup-elixir@v1
99+
uses: erlef/setup-beam@v1
100100
with:
101101
otp-version: ${{ env.OTP_VERSION }}
102102
elixir-version: ${{ env.ELIXIR_VERSION }}
103103
- run: mix format --check-formatted
104104

105105
audit:
106-
runs-on: ubuntu-18.04
106+
runs-on: ubuntu-20.04
107107
needs: ["deps"]
108108
env:
109109
NARRATIVE_HEX_ORG_API_KEY: ${{ secrets.NARRATIVE_HEX_ORG_API_KEY }}
110110
MIX_ENV: test
111111
steps:
112112
- name: Checking out project
113-
uses: actions/checkout@v2
113+
uses: actions/checkout@v4
114114
- name: "Setting up Elixir"
115-
uses: actions/setup-elixir@v1
115+
uses: erlef/setup-beam@v1
116116
with:
117117
otp-version: ${{ env.OTP_VERSION }}
118118
elixir-version: ${{ env.ELIXIR_VERSION }}
119119
- run: mix hex.organization auth narrativeapp --key $NARRATIVE_HEX_ORG_API_KEY
120120
- name: Downloading dependencies
121-
uses: actions/download-artifact@v2
121+
uses: actions/download-artifact@v4
122122
with:
123123
name: deps
124124
path: deps/
125125
- run: mix hex.audit
126126

127127
test:
128-
runs-on: ubuntu-18.04
128+
runs-on: ubuntu-20.04
129129
needs: ["deps", "build"]
130130
env:
131131
MIX_ENV: test
132132
steps:
133133
- name: Checking out project
134-
uses: actions/checkout@v2
134+
uses: actions/checkout@v4
135135
- name: "Setting up Elixir"
136-
uses: actions/setup-elixir@v1
136+
uses: erlef/setup-beam@v1
137137
with:
138138
otp-version: ${{ env.OTP_VERSION }}
139139
elixir-version: ${{ env.ELIXIR_VERSION }}
140140
- name: Downloading dependencies
141-
uses: actions/download-artifact@v2
141+
uses: actions/download-artifact@v4
142142
with:
143143
name: deps
144144
path: deps/
145145
- name: Downloading build artifacts
146-
uses: actions/download-artifact@v2
146+
uses: actions/download-artifact@v4
147147
with:
148148
name: build
149149
path: _build/
150150
- run: mix test
151151

152152
is_releasable:
153-
runs-on: ubuntu-18.04
153+
runs-on: ubuntu-20.04
154154
needs: ["deps", "test", "audit", "formatter", "credo"]
155155
if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/master'}}
156156
env:
157157
HEX_API_KEY: ${{ secrets.NARRATIVE_HEX_ORG_API_KEY }}
158158
steps:
159159
- name: Checking out project
160-
uses: actions/checkout@v2
160+
uses: actions/checkout@v4
161161
- name: "Setting up Elixir"
162-
uses: actions/setup-elixir@v1
162+
uses: erlef/setup-beam@v1
163163
with:
164164
otp-version: ${{ env.OTP_VERSION }}
165165
elixir-version: ${{ env.ELIXIR_VERSION }}
166166
- name: Downloading dependencies
167-
uses: actions/download-artifact@v2
167+
uses: actions/download-artifact@v4
168168
with:
169169
name: deps
170170
path: deps/
171171
- name: Downloading build artifacts
172-
uses: actions/download-artifact@v2
172+
uses: actions/download-artifact@v4
173173
with:
174174
name: build
175175
path: _build/
@@ -179,41 +179,41 @@ jobs:
179179
- name: Run mix hex.build
180180
run: mix hex.build -o ${{ steps.app-info.outputs.app_name }}-${{ steps.app-info.outputs.app_version }}.tar
181181
- name: Uploading hex package as job artifact
182-
uses: actions/upload-artifact@v2
182+
uses: actions/upload-artifact@v4
183183
with:
184184
name: ${{ steps.app-info.outputs.app_name }}-${{ steps.app-info.outputs.app_version }}.tar
185185
path: ${{ steps.app-info.outputs.app_name }}-${{ steps.app-info.outputs.app_version }}.tar
186186
- name: Run mix docs
187187
run: MIX_ENV=test mix docs && tar zcvf docs.tar.gz doc/
188188
- name: Uploading documentation as job artifact
189-
uses: actions/upload-artifact@v2
189+
uses: actions/upload-artifact@v4
190190
with:
191191
name: ${{ steps.app-info.outputs.app_name }}-docs-${{ steps.app-info.outputs.app_version }}.tar.gz
192192
path: docs.tar.gz
193193

194194
git_ops:
195-
runs-on: ubuntu-18.04
195+
runs-on: ubuntu-20.04
196196
needs: ["deps", "test", "audit", "formatter", "credo"]
197197
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
198198
env:
199199
HEX_API_KEY: ${{ secrets.NARRATIVE_HEX_ORG_API_KEY }}
200200
steps:
201201
- name: Checking out project
202-
uses: actions/checkout@v2
202+
uses: actions/checkout@v4
203203
with:
204204
fetch-depth: 0
205205
- name: "Setting up Elixir"
206-
uses: actions/setup-elixir@v1
206+
uses: erlef/setup-beam@v1
207207
with:
208208
otp-version: ${{ env.OTP_VERSION }}
209209
elixir-version: ${{ env.ELIXIR_VERSION }}
210210
- name: Downloading dependencies
211-
uses: actions/download-artifact@v2
211+
uses: actions/download-artifact@v4
212212
with:
213213
name: deps
214214
path: deps/
215215
- name: Downloading build artifacts
216-
uses: actions/download-artifact@v2
216+
uses: actions/download-artifact@v4
217217
with:
218218
name: build
219219
path: _build/

‎lib/mix/tasks/deploy.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ defmodule Mix.Tasks.Deploy do
2323

2424
app_name = mix_config[:app]
2525

26+
service_name = app_name
27+
2628
ext_name =
2729
app_name
2830
|> to_string
2931
|> String.replace("_", "-")
3032

31-
service_name = ext_name
32-
3333
module_name =
3434
app_name
3535
|> to_string

0 commit comments

Comments
 (0)