Skip to content

Commit

Permalink
Merge 3287ef8 into 7438c37
Browse files Browse the repository at this point in the history
  • Loading branch information
haasad committed Jan 10, 2024
2 parents 7438c37 + 3287ef8 commit 0a1dc23
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/dev-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://anaconda.org/bsteubing/activity-browser-dev
package:
name: "{{ os.environ.get('PKG_NAME', 'activity-browser-dev') }}"
version: "{{ os.environ.get('VERSION', 'dev') }}"
version: "{{ os.environ.get('GIT_BUILD_STR', 'dev') }}"

source:
path: ../..
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,14 @@ jobs:
PKG_NAME: "activity-browser-dev"
steps:
- uses: actions/checkout@v3
with:
fetch-depth: "0"
- name: Build and deploy 3.11
uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.11
activate-environment: build
environment-file: .github/conda-envs/build.yml
- name: Export version
run: |
echo "VERSION=$(date +'%Y.%m.%d')" >> $GITHUB_ENV
- name: Patch recipe with run requirements from stable
uses: mikefarah/yq@master
# Adds the run dependencies from the stable recipe to the dev recipe (inplace)
Expand Down

0 comments on commit 0a1dc23

Please sign in to comment.