Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1bb1188
feat: remove the 2h limit and dhuhur/isha recs
serafdev Apr 24, 2024
2b49564
Update CHANGELOG.md [skip ci]
Apr 24, 2024
f875862
Update docker-compose.yml
serafdev Apr 30, 2024
8c8dafe
Update CHANGELOG.md [skip ci]
Apr 30, 2024
1f15a7e
feat: Adding .env support
GitHNX May 3, 2024
201fa0f
Merge pull request #35 from ccil-kbw/feature/gotEnvPlugin
GitHNX May 4, 2024
762a996
Update CHANGELOG.md [skip ci]
May 4, 2024
68f92b1
feat: Refactor to support multiple Masjids
serafdev Apr 18, 2024
c7f2fce
feat: Add Subcommands to separate in Disctricts
serafdev Apr 18, 2024
807f5b7
feat: switch all releases to patch
serafdev May 4, 2024
093c041
feat: remove test assets and add .dockerignore
serafdev May 4, 2024
51bb871
feat: optimize RUN lines in Dockerfile
serafdev May 4, 2024
719593e
feat: add initExampleLoggerWhenFail() to improve readability
serafdev May 4, 2024
7ef6a59
feat: improve readability on logger init
serafdev May 4, 2024
58e6928
Merge pull request #34 from ccil-kbw/feature/commands-separation
serafdev May 4, 2024
0dde998
Update CHANGELOG.md [skip ci]
May 4, 2024
70ea38e
feat: simple folders move
serafdev May 4, 2024
3ebf325
Update CHANGELOG.md [skip ci]
May 4, 2024
1cf10f4
feat: refactoring how monolith loads .env
GitHNX May 4, 2024
1cdecac
Merge pull request #37 from ccil-kbw/feature/refactoring-monolith
serafdev May 4, 2024
aa286d8
Update CHANGELOG.md [skip ci]
May 4, 2024
b388c75
feat: add forking and invitation info to README.md
serafdev May 4, 2024
9344342
Merge pull request #38 from ccil-kbw/add-documentation [skip-ci]
serafdev May 4, 2024
ec4837e
Update CHANGELOG.md [skip ci]
May 4, 2024
8549dc8
Update README.md
serafdev May 4, 2024
4bb85e1
Update CHANGELOG.md [skip ci]
May 4, 2024
2f283d0
feat: add simple data
serafdev May 5, 2024
c51fac2
feat: add versioning
serafdev May 5, 2024
be5682b
Merge pull request #43 from ccil-kbw/add-masjid-data
serafdev May 5, 2024
0927e22
Update CHANGELOG.md [skip ci]
May 5, 2024
0084dae
ISSUE-36 - Organize Environment and Logger init
GitHNX May 13, 2024
21ca548
Merge pull request #46 from ccil-kbw/feature/ISSUE-36
GitHNX May 13, 2024
49f5da9
Update CHANGELOG.md [skip ci]
May 13, 2024
290418e
ISSUE-36 - Organize Environment and Logger init (#48)
GitHNX Jun 10, 2024
6105aaf
feat: add saturday dars hours for rec
serafdev Jul 6, 2024
4994fdc
fix: remove hack of installing git on github runners
serafdev Jul 6, 2024
7e57cff
Update CHANGELOG.md [skip ci]
Jul 6, 2024
f9721eb
feat: add summer program
serafdev Jul 16, 2024
9f805fe
Update CHANGELOG.md [skip ci]
Jul 16, 2024
2df5ad3
feat: mv dars to 5pm
serafdev Aug 24, 2024
b27e830
Update CHANGELOG.md [skip ci]
Aug 24, 2024
04d9e7e
feat: add daily Isha recording
serafdev Sep 4, 2024
d42a914
Update CHANGELOG.md [skip ci]
Sep 4, 2024
50f8a9f
feat: add dhuhur in recordings
serafdev Sep 4, 2024
3ecc6f5
Update CHANGELOG.md [skip ci]
Sep 4, 2024
dca318d
fix: iqama configuration not loading
serafdev Sep 30, 2024
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
6 changes: 3 additions & 3 deletions .autorc
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"name": "breaking",
"changelogTitle": "💥 Breaking Change",
"description": "Increment the major version when merged",
"releaseType": "major",
"releaseType": "patch",
"color": "#C5000B"
},
{
"name": "feature",
"changelogTitle": "🚀 Enhancement",
"description": "Increment the minor version when merged",
"releaseType": "minor",
"releaseType": "patch",
"color": "#F1A60E"
},
{
Expand All @@ -38,7 +38,7 @@
{
"name": "release",
"description": "Create a release when this pr is merged",
"releaseType": "release",
"releaseType": "patch",
"color": "#007f70"
},
{
Expand Down
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.env
.env.sample
.gitignore
CHANGELOG.md
README.md
LICENSE
Dockerfile
docker-compose.yml
.autorc
.github
.git
4 changes: 4 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MDROID_OBS_WEBSOCKET_HOST=127.0.0.1
MDROID_BOT_GUILD_ID=REDACTED
MDROID_BOT_TOKEN=REDACTED
MDROID_OBS_WEBSOCKET_PASSWORD=REDACTED
4 changes: 1 addition & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ env:

jobs:
docker-push-qa:
needs: release
runs-on: ubuntu-latest

permissions:
contents: read
packages: write
Expand Down Expand Up @@ -38,5 +36,5 @@ jobs:
context: .
file: Dockerfile
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ $GITHUB_SHA }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:qa
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
labels: ${{ steps.meta.outputs.labels }}
10 changes: 4 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ jobs:
outputs:
version: ${{ steps.version.outputs.version }}
steps:
- name: Install specific git version
run: |
echo 🤮 for the next 3 lines
sudo apt-get update
sudo add-apt-repository ppa:git-core/ppa
sudo apt install git=1:2.34.1-1ubuntu1.10 git-man=1:2.34.1-1ubuntu1.10 -y --allow-downgrades
- name: Checkout
uses: actions/checkout@v4
with: # https://stackoverflow.com/a/65081720
Expand All @@ -44,6 +38,10 @@ jobs:
run: |
echo "$(git describe --tags)"
echo "version=$(git describe --tags)" >> "$GITHUB_OUTPUT"
./tools/bump_version.sh "$(git describe --tags)"
git add ./internal/version/version.go
git add ./README.md
git commit -m "Bump version to $(git describe --tags) [skip ci]"

releases-matrix:
needs: release
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
python/
.vscode
.idea/
.env
cover.out
186 changes: 186 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,189 @@
# v2.0.21 (Wed Sep 04 2024)

#### ⚠️ Pushed to `master`

- feat: add dhuhur in recordings ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.20 (Wed Sep 04 2024)

#### ⚠️ Pushed to `master`

- feat: add daily Isha recording ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.19 (Sat Aug 24 2024)

#### ⚠️ Pushed to `master`

- feat: mv dars to 5pm ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.18 (Tue Jul 16 2024)

#### ⚠️ Pushed to `master`

- feat: add summer program ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.17 (Sat Jul 06 2024)

#### 💥 Breaking Change

- ISSUE-36 - Organize Environment and Logger init [#48](https://github.com/ccil-kbw/robot/pull/48) ([@GitHNX](https://github.com/GitHNX))

#### ⚠️ Pushed to `master`

- fix: remove hack of installing git on github runners ([@serafdev](https://github.com/serafdev))
- feat: add saturday dars hours for rec ([@serafdev](https://github.com/serafdev))

#### Authors: 2

- HNX ([@GitHNX](https://github.com/GitHNX))
- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.16 (Mon May 13 2024)

#### 💥 Breaking Change

- ISSUE-36 - Organize Environment and Logger init [#46](https://github.com/ccil-kbw/robot/pull/46) ([@GitHNX](https://github.com/GitHNX))

#### Authors: 1

- HNX ([@GitHNX](https://github.com/GitHNX))

---

# v2.0.15 (Sun May 05 2024)

#### 💥 Breaking Change

- feat: add simple data [#43](https://github.com/ccil-kbw/robot/pull/43) ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.14 (Sat May 04 2024)

#### ⚠️ Pushed to `master`

- Update README.md ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.13 (Sat May 04 2024)

#### 💥 Breaking Change

- feat: add forking and invitation info to README.md [#38](https://github.com/ccil-kbw/robot/pull/38) ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.12 (Sat May 04 2024)

#### 💥 Breaking Change

- feat: refactoring how monolith loads .env [#37](https://github.com/ccil-kbw/robot/pull/37) ([@GitHNX](https://github.com/GitHNX))

#### Authors: 1

- HNX ([@GitHNX](https://github.com/GitHNX))

---

# v2.0.11 (Sat May 04 2024)

#### ⚠️ Pushed to `master`

- feat: simple folders move ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.10 (Sat May 04 2024)

#### 💥 Breaking Change

- Commands Separation [#34](https://github.com/ccil-kbw/robot/pull/34) ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.9 (Sat May 04 2024)

#### 🐛 Bug Fix

- feat: Adding .env support [#35](https://github.com/ccil-kbw/robot/pull/35) ([@GitHNX](https://github.com/GitHNX))

#### Authors: 1

- HNX ([@GitHNX](https://github.com/GitHNX))

---

# v2.0.8 (Tue Apr 30 2024)

#### ⚠️ Pushed to `master`

- Update docker-compose.yml ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.7 (Wed Apr 24 2024)

#### ⚠️ Pushed to `master`

- feat: remove the 2h limit and dhuhur/isha recs ([@serafdev](https://github.com/serafdev))

#### Authors: 1

- فارس ([@serafdev](https://github.com/serafdev))

---

# v2.0.6 (Tue Apr 16 2024)

#### ⚠️ Pushed to `master`
Expand Down
14 changes: 9 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,24 @@ WORKDIR /app
# TODO: Optimize COPY to only copy code. Note: not urgent on ephemeral stage
COPY . .

RUN CGO_ENABLED=0 GOOS=linux go build -o /monolith ./cmd/monolith/main.go
RUN CGO_ENABLED=0 GOOS=linux go build -o /yt-upload-v2 ./cmd/yt-upload-v2/main.go
RUN CGO_ENABLED=0 GOOS=linux go build -o /mdroid-monolith ./cmd/monolith/main.go && \
CGO_ENABLED=0 GOOS=linux go build -o /mdroid-yt-uploader ./cmd/yt-upload-v2/main.go && \
CGO_ENABLED=0 GOOS=linux go build -o /mdroid-discord-bot ./cmd/discord_bot/main.go

FROM gcr.io/distroless/base-debian11 AS build-release-stage

ENV TZ=America/Montreal

WORKDIR /

COPY --from=build-stage /monolith /monolith
COPY --from=build-stage /yt-upload-v2 /yt-upload-v2
COPY --from=build-stage /mdroid-monolith /mdroid-monolith
COPY --from=build-stage /mdroid-yt-uploader /mdroid-yt-uploader
COPY --from=build-stage /mdroid-discord-bot /mdroid-discord-bot

COPY --from=build-stage /app/assets /assets

EXPOSE 3333

USER nonroot:nonroot

CMD ["/monolith"]
CMD ["/mdroid-monolith"]
Loading