Skip to content

Commit

Permalink
Merge pull request #973 from stratosphereips/develop
Browse files Browse the repository at this point in the history
Slips v1.1.1
  • Loading branch information
AlyaGomaa authored Sep 4, 2024
2 parents 9452061 + 1864ceb commit 47e59b8
Show file tree
Hide file tree
Showing 117 changed files with 8,965 additions and 3,876 deletions.
9 changes: 8 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ Steps to reproduce the behavior:
3. Scroll down to '....'
4. See error

**errors.log**
If there's an error logged to the errors.log in your output directory, you can post it here
```
Error goes here
```


**Expected behavior**
A clear and concise description of what you expected to happen.

Expand All @@ -33,7 +40,7 @@ Master or Develop?
- Are you running slips in docker or locally? [yes/no]
- Docker version (if running slips in docker) [e.g. 20.10.22]
- Slips docker image used (if running slips in docker) [e.g. macosm1-image, macosm1-P2P-image, ubuntu-image, dependency-image]

- Commit hash: ( `git rev-parse --short HEAD` )

**Additional context**
Add any other context about the problem here.
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Task Template
about: "Org admins and GSoC contributors (who will be working on this task) should use this template and create tasks, otherwise go for a Bug report or a Feature request"

---



**Task Category**
Suggest what the tasks are for (eg: gsoc or collaborations)

**Goal**
What is this task about?

**Subtasks**
There should be 3-5 subtasks
-
-
-


**Time Estimate**

How much time do think this task will take? in weeks, days, hrs, etc.

**Related issues**
(optional)

**Size**

S-M-L
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 2
updates:
- package-ecosystem: pip
- package-ecosystem: pip
directory: "/install"
target-branch: "develop"
schedule:
interval: "daily"

- package-ecosystem: "github-actions"
directory: "/"
target-branch: "develop"
Expand Down
208 changes: 0 additions & 208 deletions .github/workflows/CI-production-testing.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/CI-publishing-dependency-image.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/CI-publishing-p2p-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# clone slips and checkout branch
# By default it checks out only one commit
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: 'master'
# Fetch all history for all tags and branches
Expand All @@ -30,19 +30,19 @@ jobs:


- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: stratosphereips
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

# Set up Docker Buildx with docker-container driver is required
# at the moment to be able to use a subdirectory with Git context
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build and push p2p image using dockerfile
id: docker_build_p2p_for_slips
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
allow: network.host
context: ./
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/CI-publishing-ubuntu-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
echo "SLIPS_VERSION=$VER" >> $GITHUB_ENV
# add release tag
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: rickstaa/action-create-tag@v1
with:
tag: ${{ env.SLIPS_VERSION }}
Expand All @@ -35,29 +35,29 @@ jobs:
# clone slips and checkout branch
# By default it checks out only one commit
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: 'master'
# Fetch all history for all tags and branches
fetch-depth: ''

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: stratosphereips
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Build and publish ubuntu image from Dockerfile
id: docker_build_slips
timeout-minutes: 15
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
debug: true
verbose-debug: true
no-cache: true
context: ./
file: ./docker/ubuntu-image/Dockerfile
tags: |
stratosphereips/ubuntu_image:latest
stratosphereips/ubuntu_image:${{ env.SLIPS_VERSION }}
stratosphereips/slips:latest
stratosphereips/slips:${{ env.SLIPS_VERSION }}
push: true
2 changes: 1 addition & 1 deletion .github/workflows/CI-publishing-update-code-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'code-docs-branch'
fetch-depth: 0 # otherwise, you will fail to push refs to the dest repo
Expand Down
Loading

0 comments on commit 47e59b8

Please sign in to comment.