Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize workflow files #1119

Merged
merged 5 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 4 additions & 2 deletions ci/recipe/dev/meta.yaml → .github/dev-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# conda recipe for activity-browser-dev
# https://anaconda.org/bsteubing/activity-browser-dev
package:
name: "{{ os.environ.get('PKG_NAME', 'activity-browser-dev') }}"
version: "{{ os.environ.get('VERSION', 'dev') }}"

source:
path: ../../..
path: ../..

build:
noarch: python
Expand All @@ -20,7 +22,7 @@ requirements:
build:
- python
- setuptools
run: # dependencies are added via github action from ci/recipe/stable/meta.yaml
run: # dependencies are added via github action from stable at recipe/meta.yaml

about:
home: https://github.com/LCA-ActivityBrowser/activity-browser
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: mikefarah/yq@master
with:
cmd: |
yq eval-all 'select(fi == 0).dependencies += select(fi == 1).requirements.run | select(fi == 0)' ci/conda-envs/test.yml ci/recipe/stable/meta.yaml > patched-environment.yml
yq eval-all 'select(fi == 0).dependencies += select(fi == 1).requirements.run | select(fi == 0)' .github/conda-envs/test.yml recipe/meta.yaml > patched-environment.yml
- name: Show patched environment
run: cat patched-environment.yml
- name: Upload patched environment as artifact
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
with:
python-version: 3.8
activate-environment: build
environment-file: ci/conda-envs/build.yml
environment-file: .github/conda-envs/build.yml
- name: Export version
run: |
echo "VERSION=$(date +'%Y.%m.%d')" >> $GITHUB_ENV
Expand All @@ -122,9 +122,9 @@ jobs:
# Adds the run dependencies from the stable recipe to the dev recipe (inplace)
with:
cmd: |
yq eval-all -i 'select(fi == 0).requirements.run += select(fi == 1).requirements.run | select(fi == 0)' ci/recipe/dev/meta.yaml ci/recipe/stable/meta.yaml
yq eval-all -i 'select(fi == 0).requirements.run += select(fi == 1).requirements.run | select(fi == 0)' .github/dev-recipe/meta.yaml recipe/meta.yaml
- name: Show patched dev recipe
run: cat ci/recipe/dev/meta.yaml
run: cat .github/dev-recipe/meta.yaml
- name: Build development package
run: |
conda build ci/recipe/dev
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
id: build_changelog
uses: mikepenz/release-changelog-builder-action@v4
with:
configuration: "ci/changelog-configuration.json"
configuration: ".github/changelog-configuration.json"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create github release
Expand All @@ -30,10 +30,10 @@ jobs:
with:
python-version: 3.8
activate-environment: build
environment-file: ci/conda-envs/build.yml
environment-file: .github/conda-envs/build.yml
- name: Build activity-browser stable
run: |
conda build ci/recipe/stable
conda build recipe/
- name: Upload to anaconda.org
run: |
anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload \
Expand Down
5 changes: 4 additions & 1 deletion ci/recipe/stable/meta.yaml → recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Used https://github.com/conda-forge/staged-recipes/blob/master/recipes/example/meta.yaml as example
# conda recipe for stable release on bsteubing channel
# https://anaconda.org/bsteubing/activity-browser
# this is mainly used for development purposes, use the official release instead at
# https://anaconda.org/conda-forge/activity-browser
package:
name: activity-browser
version: "{{ GIT_DESCRIBE_TAG }}"
Expand Down